From guengel at users.sourceforge.net Tue Oct 1 08:47:26 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 01 Oct 2013 06:47:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[22065] csw/mgar/pkg/ansible/trunk Message-ID: Revision: 22065 http://gar.svn.sourceforge.net/gar/?rev=22065&view=rev Author: guengel Date: 2013-10-01 06:47:26 +0000 (Tue, 01 Oct 2013) Log Message: ----------- ansible/trunk: Bumped to version 1.3.2 Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile csw/mgar/pkg/ansible/trunk/checksums Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2013-09-30 15:18:26 UTC (rev 22064) +++ csw/mgar/pkg/ansible/trunk/Makefile 2013-10-01 06:47:26 UTC (rev 22065) @@ -1,17 +1,53 @@ NAME = ansible -VERSION = 1.0 +VERSION = 1.3.2 GARTYPE = v2 +CATEGORIES = python DESCRIPTION = Deploy, manage, and orchestrate computer systems define BLURB endef -MASTER_SITES = http://ansible.cc/releases/ -DISTFILES = $(DISTNAME).tar.gz +GITHUB_USER = ansible +GITHUB_REFERENCE= release1.3.2 +MASTER_SITES = $(GITHUB_MIRROR) +DISTNAME = $(GITHUB_USER)-$(NAME)-9d5d88b +DISTFILES = $(GITHUB_REFERENCE)$(GITHUB_BALL_EXT) -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES = CSWansible +CATALOGNAME = ansible +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_common.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/callbacks.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/playbook/__init__.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/runner/__init__.py +CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_ -CONFIGURE_SCRIPTS = +REINPLACEMENTS = etc +REINPLACE_MATCH_etc = /etc/ansible +REINPLACE_WITH_etc = /opt/csw/ansible +REINPLACE_FILES_etc = lib/ansible/constants.py +REINPLACEMENTS += usr +REINPLACE_MATCH_usr = /usr/share/ansible +REINPLACE_WITH_usr = /opt/csw/share/ansible +REINPLACE_FILES_usr = lib/ansible/constants.py + +RUNTIME_PKG_DEPS = CSWpy-jinja2 +RUNTIME_PKG_DEPS += CSWpy-yaml +RUNTIME_PKG_DEPS += CSWopenssh-client + +ARCHALL = 1 + +TEST_SCRIPTS = +LICENSE = COPYING + +MODULATIONS_PYTHON_VERSION = 2_7 + include gar/category.mk +post-merge: + if [ -d $(PKGROOT)/usr/share/ansible ] ; then \ + mv $(PKGROOT)/usr/share $(PKGROOT)$(prefix)/share ; \ + rmdir $(PKGROOT)/usr || exit 1 ; \ + fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/ansible/trunk/checksums =================================================================== --- csw/mgar/pkg/ansible/trunk/checksums 2013-09-30 15:18:26 UTC (rev 22064) +++ csw/mgar/pkg/ansible/trunk/checksums 2013-10-01 06:47:26 UTC (rev 22065) @@ -1 +1 @@ -03d9ebc5a830642bd25f0eef6382a27c ansible-1.0.tar.gz +0191890918e43fd4771b6f51c4c94663 release1.3.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 Tue Oct 1 09:12:28 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 07:12:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22066] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 22066 http://gar.svn.sourceforge.net/gar/?rev=22066&view=rev Author: dmichelsen Date: 2013-10-01 07:12:27 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mGAR v2: Add dependency to CSWpy-mysql for checkpkg Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-10-01 06:47:26 UTC (rev 22065) +++ csw/mgar/gar/v2/gar.conf.mk 2013-10-01 07:12:27 UTC (rev 22066) @@ -205,6 +205,7 @@ DEF_BASE_PKGS += CSWpy-progressbar DEF_BASE_PKGS += CSWpy-pyelftools DEF_BASE_PKGS += CSWpy-sqlobject +DEF_BASE_PKGS += CSWpy-mysql DEF_BASE_PKGS += CSWpython DEF_BASE_PKGS += CSWwget DEF_BASE_PKGS += CSWxz 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 Oct 1 09:45:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Oct 2013 07:45:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[22067] csw/mgar/pkg/lang-python/distribute/trunk/Makefile Message-ID: Revision: 22067 http://gar.svn.sourceforge.net/gar/?rev=22067&view=rev Author: wahwah Date: 2013-10-01 07:45:53 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/distribute/trunk: Build on Solaris 9 (distribute is an infrastructure rev-dep) Modified Paths: -------------- csw/mgar/pkg/lang-python/distribute/trunk/Makefile Modified: csw/mgar/pkg/lang-python/distribute/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-01 07:12:27 UTC (rev 22066) +++ csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-01 07:45:53 UTC (rev 22067) @@ -13,4 +13,5 @@ VENDOR_URL = https://pypi.python.org/pypi/distribute ARCHALL = 1 TEST_SCRIPTS = +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc 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 Oct 1 11:13:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 09:13:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[22068] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 22068 http://gar.svn.sourceforge.net/gar/?rev=22068&view=rev Author: dmichelsen Date: 2013-10-01 09:13:29 +0000 (Tue, 01 Oct 2013) Log Message: ----------- gcc4/trunk: Update to 4.8.1 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-01 07:45:53 UTC (rev 22067) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-01 09:13:29 UTC (rev 22068) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.8.0 +VERSION = 4.8.1 GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') PKG_VERSION_TOKEN = gcc4 @@ -107,7 +107,6 @@ SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibatomic1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibffi4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools$(JAVA_LIB_VERSION) @@ -146,16 +145,11 @@ # Due to complex regular expressions CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += missing-dependency|CSWpython CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWbinutils CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWggrep CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += surplus-dependency|CSWgsed -# Only man pages, so not a big problem. Alternatives could be used, but it -# requires rebuilding libffi. -CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|/opt/csw/share/info/libffi.info|$(PKG_BASENAME)core|CSWlibffi-dev - # The .a files are necessary CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += discouraged-path-in-pkgmap @@ -178,13 +172,6 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += CSWlibgcc-s1 -PACKAGES += CSWlibffi4 -CATALOGNAME_CSWlibffi4 = libffi4 -PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibffi4 += $(DESCRIPTION), libffi.so.4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibffi4 -RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1 - PACKAGES += CSWlibgcc-s1 CATALOGNAME_CSWlibgcc-s1 = libgcc_s1 PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*) @@ -360,7 +347,6 @@ PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gc-analyze.* PKGFILES_$(PKG_BASENAME)java += $(datadir)/java/.* PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libgij.*a -PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libffi.*a PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*lib-gnu-awt.*a PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*security.* PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*logging.properties @@ -417,14 +403,6 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 -# libiconv deps cropped up relatively late in the porting process. Perhaps -# they apply to all arch/OS combinations. -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibiconv2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2 -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 @@ -438,12 +416,10 @@ # 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_$(PKG_BASENAME)ada += file-with-bad-content RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 @@ -474,27 +450,6 @@ JAVA_BINARIES += gkeytool gnative2ascii gorbd grmic grmid grmiregistry JAVA_BINARIES += gserialver gtnameserv jcf-dump jv-convert rebuild-gcj-db -# GCC-4.7 contains assembler specific to sparcv9, incompatible with sparcv8. -# If we wanted to build it on Solaris 9, we would have to add these overrides. -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibffi4 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcc-s1 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgfortran3 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgij$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibgomp1 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibobjc$(LIBOBJC) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibobjc-gc$(LIBOBJC) += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibssp0 += binary-architecture-does-not-match-placement -# CHECKPKG_OVERRIDES_CSWlibstdc++6 += binary-architecture-does-not-match-placement - # We're building with the default GAR maps, currently U5. # LINKER_MAP_RELEASE = solaris10u8 @@ -507,7 +462,6 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += no-direct-binding CHECKPKG_OVERRIDES_CSWlib-gnu-awt-xlib$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibatomic1 += no-direct-binding -CHECKPKG_OVERRIDES_CSWlibffi4 += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgcj$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgcj-tools$(JAVA_LIB_VERSION) += no-direct-binding CHECKPKG_OVERRIDES_CSWlibgfortran3 += no-direct-binding Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2013-10-01 07:45:53 UTC (rev 22067) +++ csw/mgar/pkg/gcc4/trunk/checksums 2013-10-01 09:13:29 UTC (rev 22068) @@ -1 +1 @@ -e6040024eb9e761c3bea348d1fa5abb0 gcc-4.8.0.tar.bz2 +3b2386c114cd74185aa3754b58a79304 gcc-4.8.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 1 11:31:28 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Oct 2013 09:31:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22069] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 22069 http://gar.svn.sourceforge.net/gar/?rev=22069&view=rev Author: wahwah Date: 2013-10-01 09:31:28 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mGAR v2: Set compiler for 5.9 in python category There is no SOS12U3 on 5.9. Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2013-10-01 09:13:29 UTC (rev 22068) +++ csw/mgar/gar/v2/categories/python/category.mk 2013-10-01 09:31:28 UTC (rev 22069) @@ -51,6 +51,12 @@ # TODO: how can we transform this in SUN and GNU respectively? note # that it's to early(?) to use the generic name -GARCOMPILER_PYTHON_2_6 = SOS12U3 -GARCOMPILER_PYTHON_2_7 = GCC4 -GARCOMPILER = $(GARCOMPILER_PYTHON_$(PYTHON_VERSION)) +GARCOMPILER_PYTHON_2_6_5.9 = SOS12 +GARCOMPILER_PYTHON_2_7_5.9 = GCC4 +GARCOMPILER_PYTHON_2_6_5.10 = SOS12U3 +GARCOMPILER_PYTHON_2_7_5.10 = GCC4 +GARCOMPILER_PYTHON_2_6_5.11 = SOS12U3 +GARCOMPILER_PYTHON_2_7_5.11 = GCC4 +GARCOMPILER = $(GARCOMPILER_PYTHON_$(PYTHON_VERSION)_$(GAROSREL)) + +PACKAGING_PLATFORMS ?= solaris9-i386 solaris9-sparc solaris10-i386 solaris10-sparc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 13:19:53 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 11:19:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22070] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 22070 http://gar.svn.sourceforge.net/gar/?rev=22070&view=rev Author: pfelecan Date: 2013-10-01 11:19:52 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/pyqt/trunk: - adjusted dependencies - adapted to the fact that this is not a dual Python 2.x package Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-10-01 11:19:52 UTC (rev 22070) @@ -44,16 +44,18 @@ # raises compilation error when Python 2 is used... EXTRA_MERGE_EXCLUDE_FILES += $(PYTHON_SITE_PACKAGES)/PyQt4/uic/port_v3/.* -PACKAGES += CSWpy-pyqt-common -CATALOGNAME_CSWpy-pyqt-common = py_pyqt_common -SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files -ARCHALL_CSWpy-pyqt-common = 1 +PACKAGES += CSWpy-pyqt-common +CATALOGNAME_CSWpy-pyqt-common = py_pyqt_common +SPKG_DESC_CSWpy-pyqt-common = $(DESCRIPTION), common files +ARCHALL_CSWpy-pyqt-common = 1 +CHECKPKG_OVERRIDES_CSWpy-pyqt-common += python-package-missing-py26-files -PACKAGES += CSWpy-pyqt-doc -CATALOGNAME_CSWpy-pyqt-doc = py_pyqt_doc -SPKG_DESC_CSWpy-pyqt-doc = $(DESCRIPTION), documentation -PKGFILES_CSWpy-pyqt-doc += $(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)/.* -ARCHALL_CSWpy-pyqt-doc = 1 +PACKAGES += CSWpy-pyqt-doc +CATALOGNAME_CSWpy-pyqt-doc = py_pyqt_doc +SPKG_DESC_CSWpy-pyqt-doc = $(DESCRIPTION), documentation +PKGFILES_CSWpy-pyqt-doc += $(docdir)/$(CATALOGNAME_CSWpy-pyqt-doc)/.* +ARCHALL_CSWpy-pyqt-doc = 1 +CHECKPKG_OVERRIDES_CSWpy-pyqt-doc += python-package-missing-py26-files PACKAGES += CSWpy-pyqt CATALOGNAME_CSWpy-pyqt = py_pyqt @@ -62,30 +64,29 @@ PKGFILES_CSWpy-pyqt += /opt/csw/bin/pyrcc4 PKGFILES_CSWpy-pyqt += $(PYTHON_SITE_PACKAGES)/PyQt4/.* PKGFILES_CSWpy-pyqt += /opt/csw/lib/qt4/plugins/designer/.* -RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibphonon4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdbus4 -RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdeclarative4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdesigner4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqthelp4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtmultimedia4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtnetwork4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtopengl4 -RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscript4 -RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscripttools4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtsql4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqttest4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtxmlpatterns4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtwebkit4 RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWpy-pyqt-common CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWpy-pyqt-common CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 +CHECKPKG_OVERRIDES_CSWpy-pyqt += python-package-missing-py26-files 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 Oct 1 13:32:19 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 11:32:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[22071] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 22071 http://gar.svn.sourceforge.net/gar/?rev=22071&view=rev Author: dmichelsen Date: 2013-10-01 11:32:18 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mGAR v2: Allow usage of GAROSREL in GARCOMPILER selection Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-10-01 11:19:52 UTC (rev 22070) +++ csw/mgar/gar/v2/gar.conf.mk 2013-10-01 11:32:18 UTC (rev 22071) @@ -99,10 +99,6 @@ GARCOMPILER = GCC4 endif -ifeq (,$(filter $(GARCOMPILER),$(GARCOMPILERS))) - $(error The compiler '$(GARCOMPILER)' is unknown. Please select one of $(GARCOMPILERS)) -endif - # Build flavor (OPT/DBG) GARFLAVOR ?= OPT @@ -111,6 +107,9 @@ GARCH := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p)) GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r)) +ifeq (,$(filter $(GARCOMPILER),$(GARCOMPILERS))) + $(error The compiler '$(GARCOMPILER)' is unknown. Please select one of $(GARCOMPILERS)) +endif # These are the standard directory name variables from all GNU # makefiles. They're also used by autoconf, and can be adapted @@ -935,6 +934,7 @@ @echo modenv: + @echo " Platforms: $(PACKAGING_PLATFORMS)" @echo " Arch: $(GARCH)" @echo " Kernel: $(KERNELISA)" @echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 1 13:32:55 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 11:32:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[22072] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 22072 http://gar.svn.sourceforge.net/gar/?rev=22072&view=rev Author: dmichelsen Date: 2013-10-01 11:32:54 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mGAR v2: include gar/gar.mk must always be last Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2013-10-01 11:32:18 UTC (rev 22071) +++ csw/mgar/gar/v2/categories/python/category.mk 2013-10-01 11:32:54 UTC (rev 22072) @@ -47,16 +47,21 @@ MERGE_SCRIPTS_isa-default-python_version-2_7 ?= copy-all MERGE_SCRIPTS_isa-default-python_version-3_3 ?= copy-all -include gar/gar.mk - # TODO: how can we transform this in SUN and GNU respectively? note # that it's to early(?) to use the generic name +# Global modulation +GARCOMPILER_PYTHON__5.9 = SOS12 +GARCOMPILER_PYTHON__5.10 = SOS12 +GARCOMPILER_PYTHON__5.11 = SOS12 +# Specific modulations GARCOMPILER_PYTHON_2_6_5.9 = SOS12 GARCOMPILER_PYTHON_2_7_5.9 = GCC4 GARCOMPILER_PYTHON_2_6_5.10 = SOS12U3 GARCOMPILER_PYTHON_2_7_5.10 = GCC4 GARCOMPILER_PYTHON_2_6_5.11 = SOS12U3 GARCOMPILER_PYTHON_2_7_5.11 = GCC4 -GARCOMPILER = $(GARCOMPILER_PYTHON_$(PYTHON_VERSION)_$(GAROSREL)) +GARCOMPILER ?= $(GARCOMPILER_PYTHON_$(PYTHON_VERSION)_$(GAROSREL)) PACKAGING_PLATFORMS ?= solaris9-i386 solaris9-sparc solaris10-i386 solaris10-sparc + +include gar/gar.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 14:22:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 12:22:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[22073] csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Message-ID: Revision: 22073 http://gar.svn.sourceforge.net/gar/?rev=22073&view=rev Author: pfelecan Date: 2013-10-01 12:22:20 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/pyqt/trunk: added dpenedcies and overrides for the mixed support of declaratrive, script and scriptools on i386 and SPARC Modified Paths: -------------- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyqt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-10-01 11:32:54 UTC (rev 22072) +++ csw/mgar/pkg/lang-python/pyqt/trunk/Makefile 2013-10-01 12:22:20 UTC (rev 22073) @@ -87,6 +87,15 @@ CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=18|arch_name=sparcv8+ CHECKPKG_OVERRIDES_CSWpy-pyqt += binary-architecture-does-not-match-placement|file=opt/csw/lib/qt4/plugins/designer/libpythonplugin.so|arch_id=3|arch_name=i386 CHECKPKG_OVERRIDES_CSWpy-pyqt += python-package-missing-py26-files +# the following 3 libraries are suported by Qt only on i386: +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtdeclarative4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscript4 +RUNTIME_DEP_PKGS_CSWpy-pyqt += CSWlibqtscripttools4 +# the following 3 overrides are only for SPARc as the libraires are +# not supportd yet: +CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWlibqtdeclarative4 +CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWlibqtscript4 +CHECKPKG_OVERRIDES_CSWpy-pyqt += surplus-dependency|CSWlibqtscripttools4 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 Oct 1 14:46:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 12:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[22074] csw/mgar/pkg/patch/trunk Message-ID: Revision: 22074 http://gar.svn.sourceforge.net/gar/?rev=22074&view=rev Author: dmichelsen Date: 2013-10-01 12:46:43 +0000 (Tue, 01 Oct 2013) Log Message: ----------- patch/trunk: Update to 2.7.1 Modified Paths: -------------- csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/patch/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2013-10-01 12:22:20 UTC (rev 22073) +++ csw/mgar/pkg/patch/trunk/Makefile 2013-10-01 12:46:43 UTC (rev 22074) @@ -1,5 +1,5 @@ NAME = patch -VERSION = 2.6.1 +VERSION = 2.7.1 GARTYPE = v2 DESCRIPTION = GNU patch utility @@ -8,33 +8,23 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(DISTNAME).tar.xz -# Add some missing files from gnulib until this is fixed: -# https://savannah.gnu.org/bugs/?30378 -PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch -PATCHFILES += 0002-Add-missing-m4-files.patch +VENDOR_URL = https://savannah.gnu.org/projects/patch/ -PACKAGES = CSWgpatch +PACKAGES += CSWgpatch +SPKG_DESC_CSWgpatch = GNU patch utility -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -DEP_PKGS = CSWlibgnugetopt - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g -EXTRA_LINKER_FLAGS = -lgnugetopt -BUILD_ARGS = SHELL=bash +BUILD64 = 1 +ISAEXEC = 1 +EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias + include gar/category.mk -post-extract-modulated: - @# GARs usage of .git for patching in the package confuses the upstream building as - @# if it was bootstrapped. - -echo "exit 0" > $(WORKSRC)/update-version.sh - post-install-modulated: ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) Modified: csw/mgar/pkg/patch/trunk/checksums =================================================================== --- csw/mgar/pkg/patch/trunk/checksums 2013-10-01 12:22:20 UTC (rev 22073) +++ csw/mgar/pkg/patch/trunk/checksums 2013-10-01 12:46:43 UTC (rev 22074) @@ -1,3 +1 @@ -46d02b036813c195171f723f162e3786 0001-Add-missing-strnlen.c-from-GNUlib.patch -f18f4ae6a5d427f20941a439fcd7d61a 0002-Add-missing-m4-files.patch -d758eb96d3f75047efc004a720d33daf patch-2.6.1.tar.gz +e9ae5393426d3ad783a300a338c09b72 patch-2.7.1.tar.xz Deleted: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch =================================================================== --- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch 2013-10-01 12:22:20 UTC (rev 22073) +++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch 2013-10-01 12:46:43 UTC (rev 22074) @@ -1,50 +0,0 @@ -From e45bf18c6a3355d54dc29b6b259ae21e83ff8041 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 11 Feb 2010 10:19:05 +0100 -Subject: [PATCH 1/2] Add missing strnlen.c from GNUlib - ---- - gl/lib/strnlen.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - create mode 100644 gl/lib/strnlen.c - -diff --git a/gl/lib/strnlen.c b/gl/lib/strnlen.c -new file mode 100644 -index 0000000..d346d32 ---- /dev/null -+++ b/gl/lib/strnlen.c -@@ -0,0 +1,31 @@ -+/* Find the length of STRING, but scan at most MAXLEN characters. -+ Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. -+ Written by Simon Josefsson. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include -+ -+#include -+ -+/* Find the length of STRING, but scan at most MAXLEN characters. -+ If no '\0' terminator is found in that many characters, return MAXLEN. */ -+ -+size_t -+strnlen (const char *string, size_t maxlen) -+{ -+ const char *end = memchr (string, '\0', maxlen); -+ return end ? (size_t) (end - string) : maxlen; -+} --- -1.7.1 - Deleted: csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch =================================================================== --- csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch 2013-10-01 12:22:20 UTC (rev 22073) +++ csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch 2013-10-01 12:46:43 UTC (rev 22074) @@ -1,76 +0,0 @@ -From e70f6d46e9a2f6df77a234e0a0404588c39bd142 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 30 Jun 2010 16:23:10 +0200 -Subject: [PATCH 2/2] Add missing m4 files - ---- - gl/m4/safe-read.m4 | 18 ++++++++++++++++++ - gl/m4/strnlen.m4 | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 0 deletions(-) - create mode 100644 gl/m4/safe-read.m4 - create mode 100644 gl/m4/strnlen.m4 - -diff --git a/gl/m4/safe-read.m4 b/gl/m4/safe-read.m4 -new file mode 100644 -index 0000000..7a89d0a ---- /dev/null -+++ b/gl/m4/safe-read.m4 -@@ -0,0 +1,18 @@ -+# safe-read.m4 serial 5 -+dnl Copyright (C) 2002, 2003, 2005, 2006 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. -+ -+AC_DEFUN([gl_SAFE_READ], -+[ -+ AC_LIBOBJ([safe-read]) -+ -+ gl_PREREQ_SAFE_READ -+]) -+ -+# Prerequisites of lib/safe-read.c. -+AC_DEFUN([gl_PREREQ_SAFE_READ], -+[ -+ AC_REQUIRE([gt_TYPE_SSIZE_T]) -+]) -diff --git a/gl/m4/strnlen.m4 b/gl/m4/strnlen.m4 -new file mode 100644 -index 0000000..1c97859 ---- /dev/null -+++ b/gl/m4/strnlen.m4 -@@ -0,0 +1,31 @@ -+# strnlen.m4 serial 10 -+dnl Copyright (C) 2002-2003, 2005-2007, 2009 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. -+ -+AC_DEFUN([gl_FUNC_STRNLEN], -+[ -+ dnl Persuade glibc to declare strnlen(). -+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -+ -+ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_CHECK_DECLS_ONCE([strnlen]) -+ if test $ac_cv_have_decl_strnlen = no; then -+ HAVE_DECL_STRNLEN=0 -+ fi -+ -+ AC_FUNC_STRNLEN -+ if test $ac_cv_func_strnlen_working = no; then -+ # This is necessary because automake-1.6.1 doesn't understand -+ # that the above use of AC_FUNC_STRNLEN means we may have to use -+ # lib/strnlen.c. -+ #AC_LIBOBJ([strnlen]) -+ AC_DEFINE([strnlen], [rpl_strnlen], -+ [Define to rpl_strnlen if the replacement function should be used.]) -+ gl_PREREQ_STRNLEN -+ fi -+]) -+ -+# Prerequisites of lib/strnlen.c. -+AC_DEFUN([gl_PREREQ_STRNLEN], [:]) --- -1.7.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 1 15:14:00 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Oct 2013 13:14:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[22075] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 22075 http://gar.svn.sourceforge.net/gar/?rev=22075&view=rev Author: wahwah Date: 2013-10-01 13:14:00 +0000 (Tue, 01 Oct 2013) Log Message: ----------- checkpkg: A Python package must contain .py files A new check. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2013-10-01 12:46:43 UTC (rev 22074) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2013-10-01 13:14:00 UTC (rev 22075) @@ -852,13 +852,11 @@ # It's not a Python 2.x module. Nothing to see here. return spotted_a_py26_file = False - example_py_file = "" for pkgmap_entry in pkg_data["pkgmap"]: if not pkgmap_entry["path"]: continue if py26_file_re.match(pkgmap_entry["path"]): spotted_a_py26_file = True - example_py_file = pkgmap_entry["path"] break if not spotted_a_py26_file: error_mgr.ReportError("python-package-missing-py26-files") @@ -867,6 +865,28 @@ "does not contain any files for Python 2.6. ") +def CheckPyPackageContainsPyFiles(pkg_data, error_mgr, logger, messenger): + """Packages named CSWpy- must provide files for Python 2.6.""" + py_file_re = re.compile(r"/opt/csw/lib/python.*\.py$") + pkgname = pkg_data["basic_stats"]["pkgname"] + has_py_prefix = pkgname.startswith("CSWpy-") + if not has_py_prefix: + # It's not a Python module. Nothing to see here. + return + spotted_a_py_file = False + for pkgmap_entry in pkg_data["pkgmap"]: + if not pkgmap_entry["path"]: + continue + if py_file_re.match(pkgmap_entry["path"]): + spotted_a_py_file = True + break + if not spotted_a_py_file: + error_mgr.ReportError("python-package-missing-py-files") + messenger.Message( + "The package has the CSWpy- prefix but " + "does not contain any .py files.") + + def CheckArchitecture(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] for metadata in pkg_data["files_metadata"]: 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 Oct 1 15:32:45 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 01 Oct 2013 13:32:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[22076] csw/mgar/pkg/mpg321/trunk Message-ID: Revision: 22076 http://gar.svn.sourceforge.net/gar/?rev=22076&view=rev Author: dmichelsen Date: 2013-10-01 13:32:45 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mpg321/trunk: Update to 0.3.2 Modified Paths: -------------- csw/mgar/pkg/mpg321/trunk/Makefile csw/mgar/pkg/mpg321/trunk/checksums Modified: csw/mgar/pkg/mpg321/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpg321/trunk/Makefile 2013-10-01 13:14:00 UTC (rev 22075) +++ csw/mgar/pkg/mpg321/trunk/Makefile 2013-10-01 13:32:45 UTC (rev 22076) @@ -3,49 +3,30 @@ # $Id$ NAME = mpg321 -VERSION = 0.2.13_2 +VERSION = 0.3.2 GARTYPE = v2 DESCRIPTION = A Free, fast fixed-point math replacement for mpg123 -define BLURB -endef - MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(NAME)-$(subst _,-,$(VERSION)) -DISTFILES = $(DISTNAME).tar.gz +DISTNAME = $(NAME)-$(VERSION)-orig +DISTFILES += $(NAME)_$(VERSION).orig.tar.gz VENDOR_URL = http://mpg321.sourceforge.net/ RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibao4 RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibid3tag -RUNTIME_DEP_PKGS_CSWmpg321 += CSWzlib -RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWmpg321 += CSWlibid3tag0 BUILD_DEP_PKGS += CSWlibao-dev BUILD_DEP_PKGS += CSWlibmad-dev -BUILD_DEP_PKGS += CSWlibid3tag -BUILD_DEP_PKGS += CSWzlib -BUILD_DEP_PKGS += CSWlibgnugetopt +BUILD_DEP_PKGS += CSWlibid3tag-dev -# We don't have round on Solaris 9 -EXTRA_CPPFLAGS = -Dround=floor - EXTRA_LINKER_FLAGS += -lrt -EXTRA_LINKER_FLAGS += -lgnugetopt -ALTERNATIVES = mpg321 -ALTERNATIVE_mpg321 = $(bindir)/mpg123 mpg123 $(bindir)/mpg321 50 +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-mpg123-symlink=no +CONFIGURE_ARGS += --enable-ipv6=yes +CONFIGURE_ARGS += --enable-alsa=no -# Checkpkg can't check this -CHECKPKG_OVERRIDES_CSWmpg321 += surplus-dependency|CSWalternatives - -# Location explicitly stated for Debian -CHECKPKG_OVERRIDES_CSWmpg321 += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/mpg321.1 - include gar/category.mk - -post-merge: - rm $(PKGROOT)$(bindir)/mpg123 - @$(MAKECOOKIE) Modified: csw/mgar/pkg/mpg321/trunk/checksums =================================================================== --- csw/mgar/pkg/mpg321/trunk/checksums 2013-10-01 13:14:00 UTC (rev 22075) +++ csw/mgar/pkg/mpg321/trunk/checksums 2013-10-01 13:32:45 UTC (rev 22076) @@ -1 +1 @@ -1398ef00439a94bebd4342e98b30c3a3 mpg321-0.2.13-2.tar.gz +d3c343d2183e239e4df56a4aae2466a6 mpg321_0.3.2.orig.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Tue Oct 1 15:35:13 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Tue, 01 Oct 2013 15:35:13 +0200 Subject: [csw-devel] SF.net SVN: gar:[22075] csw/mgar/gar/v2/lib/python/package_checks.py In-Reply-To: (wahwah@users.sourceforge.net's message of "Tue, 01 Oct 2013 13:14:00 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > + """Packages named CSWpy- must provide files for Python 2.6.""" I beg to differ: a CSWpy- package must provide Python files, whatever version, not specifically 2.6. -- Peter From pfelecan at users.sourceforge.net Tue Oct 1 16:10:15 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 14:10:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[22077] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 22077 http://gar.svn.sourceforge.net/gar/?rev=22077&view=rev Author: pfelecan Date: 2013-10-01 14:10:15 +0000 (Tue, 01 Oct 2013) Log Message: ----------- guile/trunk: change the content of the main library package as intended Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-10-01 13:32:45 UTC (rev 22076) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-10-01 14:10:15 UTC (rev 22077) @@ -60,6 +60,9 @@ OBSOLETED_BY_CSWlibguile2-0-22 = CSWguilelib12 PKGFILES_CSWlibguile2-0-22 += $(call baseisadirs,$(libdir),libguile-2\.0\.so\.22\.6\.0) PKGFILES_CSWlibguile2-0-22 += $(call baseisadirs,$(libdir),libguile-2\.0\.so\.22(\.\d+)*) +PKGFILES_CSWlibguile2-0-22 += /opt/csw/lib/guile/.* +PKGFILES_CSWlibguile2-0-22 += /opt/csw/lib/amd64/guile/.* +PKGFILES_CSWlibguile2-0-22 += /opt/csw/share/guile/.* # old libraries: SPKG_DESC_CSWlibguile2-0-22 += $(DESCRIPTION), libguile-2.0.so.22 RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibltdl7 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 Oct 1 16:48:59 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Oct 2013 14:48:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[22078] csw/mgar/pkg/lang-python/pysetuptools/trunk Message-ID: Revision: 22078 http://gar.svn.sourceforge.net/gar/?rev=22078&view=rev Author: wahwah Date: 2013-10-01 14:48:59 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/pysetuptools/trunk: There's a file with a space in the filename Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2013-10-01 14:10:15 UTC (rev 22077) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2013-10-01 14:48:59 UTC (rev 22078) @@ -1,11 +1,11 @@ # $Id$ NAME = setuptools -VERSION = 0.6c11 +VERSION = 1.1.6 CATEGORIES = python GARTYPE = v2 -SPKG_SOURCEURL = http://peak.telecommunity.com/DevCenter/setuptools +VENDOR_URL = https://pypi.python.org/pypi/setuptools PYSETUPTOOLS_VERSION := $(shell echo $(VERSION) | sed -e 's/[a-z].*//') PYSETUPTOOLS_RELEASE := $(shell echo $(VERSION) | sed -e 's/^[0-9].[0-9]*//') @@ -15,19 +15,13 @@ endef ARCHALL_CSWpy-setuptools = 1 -MASTER_SITES = http://cheeseshop.python.org/packages/source/s/setuptools/ -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE -PACKAGES = CSWpy-setuptools -CATALOG_NAME_CSWpy-setuptools = py_setuptools OBSOLETED_BY_CSWpy-setuptools = CSWpysetuptools SPKG_DESC_CSWpy-setuptools = Distribution Utiltiies for Python -TEST_SCRIPTS = +TEST_SCRIPTS = LICENSE = LICENSE -CHECKPKG_OVERRIDES_CSWpysetuptools += surplus-dependency|CSWpython - include gar/category.mk post-merge: Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2013-10-01 14:10:15 UTC (rev 22077) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/checksums 2013-10-01 14:48:59 UTC (rev 22078) @@ -1,2 +1 @@ -6112dae19d2f18243f252dd4ca059255 LICENSE -7df2a529a074f613b509fb44feefe74e setuptools-0.6c11.tar.gz +ee82ea53def4480191061997409d2996 setuptools-1.1.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 1 18:06:36 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 01 Oct 2013 16:06:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[22079] csw/mgar/pkg/lang-python/pysetuptools/trunk Message-ID: Revision: 22079 http://gar.svn.sourceforge.net/gar/?rev=22079&view=rev Author: wahwah Date: 2013-10-01 16:06:35 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/pysetuptools/trunk: Work around files with spaces Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2013-10-01 14:48:59 UTC (rev 22078) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2013-10-01 16:06:35 UTC (rev 22079) @@ -10,10 +10,13 @@ PYSETUPTOOLS_RELEASE := $(shell echo $(VERSION) | sed -e 's/^[0-9].[0-9]*//') DESCRIPTION = Distribution Utilities for Python + define BLURB Distribution Utilities for Python endef +PATCHFILES += 0001-Solaris-package-mge-does-not-handle-spaces.patch + ARCHALL_CSWpy-setuptools = 1 DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE @@ -22,8 +25,17 @@ TEST_SCRIPTS = LICENSE = LICENSE +CHECKPKG_OVERRIDES_CSWpy-setuptools += file-with-bad-content + include gar/category.mk +post-install-modulated: + mv "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script template.py" \ + "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script_template.py" + mv "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script template (dev).py" \ + "$(DESTDIR)$(SITE_PACKAGES)/setuptools/script_template_(dev).py" + @$(MAKECOOKIE) + post-merge: @(cd $(PKGROOT)/$(SITE_PACKAGES)/setuptools/; \ rm -rf tests ) Added: csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch (rev 0) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/files/0001-Solaris-package-mge-does-not-handle-spaces.patch 2013-10-01 16:06:35 UTC (rev 22079) @@ -0,0 +1,25 @@ +From 2b9d28c7baad8086bba0afdbb343051a3b55f235 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Tue, 1 Oct 2013 17:57:01 +0200 +Subject: [PATCH] Solaris package mge does not handle spaces + +--- + setuptools/command/easy_install.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py +index 6ce19fa..f0ab449 100644 +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py +@@ -759,7 +759,7 @@ Please make the appropriate changes for your system and try again. + return clean_template + + if is_script: +- template_name = 'script template.py' ++ template_name = 'script_template.py' + if dev_path: + template_name = template_name.replace('.py', ' (dev).py') + script_text = (get_script_header(script_text) + +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Oct 1 18:31:51 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 01 Oct 2013 16:31:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[22080] csw/mgar/pkg/php5/branches Message-ID: Revision: 22080 http://gar.svn.sourceforge.net/gar/?rev=22080&view=rev Author: wilbury Date: 2013-10-01 16:31:51 +0000 (Tue, 01 Oct 2013) Log Message: ----------- php5/branches/php5-5.3.x: PHP 5.3 instantiation. Added Paths: ----------- csw/mgar/pkg/php5/branches/php5-5.3.x/ csw/mgar/pkg/php5/branches/php5-5.3.x/Makefile csw/mgar/pkg/php5/branches/php5-5.3.x/checksums csw/mgar/pkg/php5/branches/php5-5.3.x/extensions/ csw/mgar/pkg/php5/branches/php5-5.3.x/files/ Copied: csw/mgar/pkg/php5/branches/php5-5.3.x/Makefile (from rev 22078, csw/mgar/pkg/php5/trunk/Makefile) =================================================================== --- csw/mgar/pkg/php5/branches/php5-5.3.x/Makefile (rev 0) +++ csw/mgar/pkg/php5/branches/php5-5.3.x/Makefile 2013-10-01 16:31:51 UTC (rev 22080) @@ -0,0 +1,387 @@ +NAME = php5 +VERSION = 5.3.25 +GARTYPE = v2 +SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') +DISTNAME = $(SF_PROJECT)-$(VERSION) + +DESCRIPTION = A high-level scripting language. +define BLURB +PHP is a widely-used Open Source general-purpose scripting language that is +especially suited for Web development and can be embedded into HTML. Its +syntax draws upon C, Java, and Perl, and is easy to learn. PHP runs on many +different platforms and can be used as a standalone executable or as a +module under a variety of Web servers. It has excellent support for +databases, XML, LDAP, IMAP, Java, various Internet protocols, and general +data manipulation, and is extensible via its powerful API. It is actively +developed and supported by a talented and energetic international team. +Numerous Open Source and commercial PHP-based application packages are +available. +endef + +EXTRA_MODULATORS = SAPI +MODULATIONS_SAPI = cgi ap2 +MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all +MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all + +# turn on the build scripts to enable/disable modules +PHP5_EXT = 1 +AP2_MODS = 1 +AP2_MODFILES = *libphp5.so + +# at least for a decent echo used during build. +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) + +VENDOR_URL = http://www.php.net/ +MASTER_SITES = http://us.php.net/distributions/ +EXTRA_INSTALL_ENV = INSTALL_ROOT=$(DESTDIR) + +LICENSE = LICENSE + +DISTFILES += $(DISTNAME).tar.bz2 +DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall +DISTFILES += CSWphp5.cswreleasenotes +DISTFILES += CSWap2-modphp5.cswreleasenotes +DISTFILES += CSWap2-modphp5.postinstall +DISTFILES += CSWap2-modphp5.preremove +DISTFILES += httpd-php5.conf + +PATCHFILES += 0001-Strip-usr-ucblib-references.patch +PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch + +BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils +BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg +BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWlibgdbm-dev CSWlibgmp10 +BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel +BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev +BUILD_DEP_PKGS += CSWopenldap-dev CSWlibkrb5-dev CSWsasl CSWlibltdl7 +BUILD_DEP_PKGS += CSWmcrypt-dev CSWfreetds CSWmysql-dev CSWunixodbc +BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev +BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibxpm-dev +BUILD_DEP_PKGS += CSWlibaspell-dev + +PRESERVECONF = $(sysconfdir)/php.ini $(sysconfdir)/pear.conf +PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf +MIGRATE_FILES_CSWphp5 = "php.ini" +MIGRATE_SOURCE_DIR_CSWphp5 = /opt/csw/php5/lib +MIGRATE_DEST_DIR = $(sysconfdir) + +define php5_subpackage +PACKAGES += CSWphp5-$(1) +CATALOGNAME_CSWphp5-$(1) ?= php5_$(1) +SPKG_DESC_CSWphp5-$(1) ?= The $(1) extention for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-$(1) ?= CSWphp5 $(2) +OBSOLETED_BY_CSWphp5-$(1) ?= CSWphp5$(1) +PKGFILES_CSWphp5-$(1) ?= .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1) +CHECKPKG_OVERRIDES_CSWphp5-$(1) += surplus-dependency|CSWphp5 +endef + +PACKAGES = CSWphp5 +CATALOGNAME_CSWphp5 = php5 +SPKG_DESC_CSWphp5 = A High-Level Scripting Language +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibexpat1 CSWlibz1 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuuc51 +INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase +INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5 +# embeded 'magic' information to detect file types...odd, but... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/PEAR/Config.php +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/opt/csw/php5/bin/php-cgi +# verify these... +CHECKPKG_OVERRIDES_CSWphp5 += file-with-bad-content|/usr/local|root/etc/opt/csw/php5/php.ini.CSW + +PACKAGES += CSWphp5-dev +CATALOGNAME_CSWphp5-dev = php5_dev +SPKG_DESC_CSWphp5-dev = Development files for php5 +RUNTIME_DEP_PKGS_CSWphp5-dev = CSWphp5 +OBSOLETED_BY_CSWphp5-dev = CSWphp5devel +PKGFILES_CSWphp5-dev = $(prefix)/php5/bin/php-config +PKGFILES_CSWphp5-dev = $(prefix)/bin/php-config +PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/phpize +PKGFILES_CSWphp5-dev += $(prefix)/php5/bin/peardev +PKGFILES_CSWphp5-dev += $(prefix)/bin/peardev +PKGFILES_CSWphp5-dev += $(prefix)/php5/lib/php/build/.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/TSRM.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/Zend.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/include.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/main.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/regex.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/date.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/filter.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/libxml.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/pcre.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/spl.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/standard.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/include/php/ext/xml.* +PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/php-config.1 +PKGFILES_CSWphp5-dev += $(prefix)/php5/man/man1/phpize.1 +CHECKPKG_OVERRIDES_CSWphp5-dev += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/libtool.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/acinclude.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/shtool +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4 +CHECKPKG_OVERRIDES_CSWphp5-dev += file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1 + +PACKAGES += CSWap2-modphp5 +CATALOGNAME_CSWap2-modphp5 = ap2_modphp5 +SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module +RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuuc51 +OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5 +PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.* +CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5 +CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so + +$(eval $(call php5_subpackage,bcmath,)) +$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0)) +$(eval $(call php5_subpackage,calendar,)) +$(eval $(call php5_subpackage,ctype,)) +$(eval $(call php5_subpackage,curl,CSWlibcurl4)) +$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42)) +$(eval $(call php5_subpackage,dom,CSWlibxml2-2)) +PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* +$(eval $(call php5_subpackage,exif,)) +$(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0)) +$(eval $(call php5_subpackage,gd,CSWlibgd2 CSWlibt1-5)) +PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* +$(eval $(call php5_subpackage,gettext,CSWlibintl8)) +$(eval $(call php5_subpackage,gmp,CSWlibgmp10)) +$(eval $(call php5_subpackage,hash,)) +PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* +$(eval $(call php5_subpackage,iconv,CSWlibiconv2)) +PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* +$(eval $(call php5_subpackage,imap,CSWlibc-client2007f)) +$(eval $(call php5_subpackage,json,)) +$(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2)) +$(eval $(call php5_subpackage,mbstring,)) +PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* +$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4)) +$(eval $(call php5_subpackage,mssql,CSWlibsybdb5)) +$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibssl1-0-0)) +# likely a checkpkg glitch (uses sparcv8plus+vis path for the library) +CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 +$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18)) +$(eval $(call php5_subpackage,odbc,CSWlibodbc2)) +$(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0)) +$(eval $(call php5_subpackage,pcntl,)) +$(eval $(call php5_subpackage,pdo,)) +PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* +$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo)) +PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so +PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5 +$(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo)) +PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so +PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5 +$(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo)) +PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so +PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5 +$(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0)) +PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so +PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo +CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5 +$(eval $(call php5_subpackage,pgsql,CSWlibpq5)) +$(eval $(call php5_subpackage,posix,)) +$(eval $(call php5_subpackage,pspell,CSWlibaspell15)) +$(eval $(call php5_subpackage,readline,CSWlibreadline6)) +$(eval $(call php5_subpackage,session,CSWlibmm)) +PKGFILES_CSWphp5-session += .*/include/php/ext/session.* +$(eval $(call php5_subpackage,shmop,)) +$(eval $(call php5_subpackage,snmp,CSWlibnetsnmp25)) +$(eval $(call php5_subpackage,soap,CSWlibxml2-2)) +$(eval $(call php5_subpackage,sockets,)) +$(eval $(call php5_subpackage,sqlite,CSWsqlite)) +$(eval $(call php5_subpackage,sysvmsg,)) +$(eval $(call php5_subpackage,sysvsem,)) +$(eval $(call php5_subpackage,sysvshm,)) +$(eval $(call php5_subpackage,tidy,CSWlibtidy0-99)) +$(eval $(call php5_subpackage,tokenizer,)) +$(eval $(call php5_subpackage,wddx,)) +$(eval $(call php5_subpackage,xmlreader,CSWlibxml2-2)) +$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1)) +$(eval $(call php5_subpackage,xmlwriter,CSWlibxml2-2)) +$(eval $(call php5_subpackage,xsl,CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0)) +$(eval $(call php5_subpackage,zip,CSWlibz1)) + +EXTRA_CFLAGS = -I$(prefix)/include/ncursesw +EXTRA_LIB = /opt/csw/postgresql/lib + +# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so, +# using CC as linker would have made this automatic. +SUBDIR64-sparc = v9 +SUBDIR64-i386 = amd64 +EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz + +NOISALIST = 1 +STRIP_LIBTOOL = 1 + +sysconfdir = /etc$(prefix)/php5 + +CONFIGURE_ARGS += --prefix=$(prefix)/php5 +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +## build this static, php can not run without it. +## it is more efficient to have this built into the php binary +CONFIGURE_ARGS += --enable-simplexml +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-xml +CONFIGURE_ARGS += --enable-intl +CONFIGURE_ARGS += --with-libxml-dir=$(prefix) +CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir) +CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d +CONFIGURE_ARGS += --enable-bcmath=shared +CONFIGURE_ARGS += --enable-calendar=shared +CONFIGURE_ARGS += --enable-ctype=shared +CONFIGURE_ARGS += --enable-dba=shared +CONFIGURE_ARGS += --enable-dom=shared +CONFIGURE_ARGS += --enable-exif=shared +CONFIGURE_ARGS += --enable-filter=shared +CONFIGURE_ARGS += --enable-ftp=shared +CONFIGURE_ARGS += --enable-gd-jis-conv +CONFIGURE_ARGS += --enable-gd-native-ttf +CONFIGURE_ARGS += --enable-hash=shared +CONFIGURE_ARGS += --enable-json=shared +CONFIGURE_ARGS += --enable-magic-quotes +CONFIGURE_ARGS += --enable-mbstring=shared +CONFIGURE_ARGS += --enable-pcntl=shared +CONFIGURE_ARGS += --enable-pdo=shared +CONFIGURE_ARGS += --enable-phar=shared +CONFIGURE_ARGS += --enable-posix=shared +CONFIGURE_ARGS += --enable-session=shared +CONFIGURE_ARGS += --enable-shmop=shared +CONFIGURE_ARGS += --enable-soap=shared +CONFIGURE_ARGS += --enable-sockets=shared +CONFIGURE_ARGS += --enable-sqlite-utf8 +CONFIGURE_ARGS += --enable-sqlite3=shared,$(prefix) +CONFIGURE_ARGS += --enable-sysvmsg=shared +CONFIGURE_ARGS += --enable-sysvsem=shared +CONFIGURE_ARGS += --enable-sysvshm=shared +CONFIGURE_ARGS += --enable-tokenizer=shared +CONFIGURE_ARGS += --enable-wddx=shared +CONFIGURE_ARGS += --enable-xmlreader=shared +CONFIGURE_ARGS += --enable-xmlwriter=shared +CONFIGURE_ARGS += --enable-zip=shared +CONFIGURE_ARGS += --with-bz2=shared,$(prefix) +CONFIGURE_ARGS += --with-curl=shared,$(prefix) +CONFIGURE_ARGS += --with-curlwrappers +CONFIGURE_ARGS += --with-db4=$(prefix)/bdb4 +CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin +CONFIGURE_ARGS += --with-freetype-dir=$(prefix) +CONFIGURE_ARGS += --with-gd=shared,$(prefix) +CONFIGURE_ARGS += --with-gdbm=$(prefix) +CONFIGURE_ARGS += --with-gettext=shared,$(prefix) +CONFIGURE_ARGS += --with-gmp=shared,$(prefix) +CONFIGURE_ARGS += --with-iconv=shared,$(prefix) +CONFIGURE_ARGS += --with-imap-ssl=$(prefix) +CONFIGURE_ARGS += --with-imap=shared,$(prefix) +CONFIGURE_ARGS += --with-jpeg-dir=$(prefix) +CONFIGURE_ARGS += --with-kerberos=$(prefix) +CONFIGURE_ARGS += --with-ldap-sasl=$(prefix) +CONFIGURE_ARGS += --with-ldap=shared,$(prefix) +CONFIGURE_ARGS += --with-libedit=no +CONFIGURE_ARGS += --with-libexpat-dir=$(prefix) +CONFIGURE_ARGS += --with-mcrypt=shared,$(prefix) +CONFIGURE_ARGS += --with-mhash=shared,$(prefix) +CONFIGURE_ARGS += --with-mm=$(prefix) +CONFIGURE_ARGS += --with-mssql=shared,$(prefix) +CONFIGURE_ARGS += --with-mysql=shared,$(prefix) +CONFIGURE_ARGS += --with-mysqli=shared,$(prefix)/bin/mysql_config +CONFIGURE_ARGS += --with-ndbm +CONFIGURE_ARGS += --with-openssl=shared,$(prefix) +CONFIGURE_ARGS += --with-pcre-dir=$(prefix) +CONFIGURE_ARGS += --with-pcre-regex +# not documented, but you can pass the path to mysql_config directly +# we need the 32-bit version, so we have to force this +CONFIGURE_ARGS += --with-pdo-mysql=shared,$(prefix)/bin/mysql_config +CONFIGURE_ARGS += --with-pdo-odbc=shared,unixODBC,$(prefix) +CONFIGURE_ARGS += --with-pdo-pgsql=shared,$(bindir)/ +CONFIGURE_ARGS += --with-pdo-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-pear=shared +CONFIGURE_ARGS += --with-pgsql=shared,$(bindir)/ +CONFIGURE_ARGS += --with-png-dir=$(prefix) +CONFIGURE_ARGS += --with-pspell=shared,$(prefix) +CONFIGURE_ARGS += --with-readline=shared,/opt/csw +CONFIGURE_ARGS += --with-snmp=shared,$(prefix) +CONFIGURE_ARGS += --with-sqlite=shared,$(prefix) +CONFIGURE_ARGS += --with-t1lib=$(prefix) +CONFIGURE_ARGS += --with-tidy=shared,$(prefix) +CONFIGURE_ARGS += --with-unixODBC=shared,$(prefix) +CONFIGURE_ARGS += --with-xmlrpc=shared +CONFIGURE_ARGS += --with-xpm-dir=$(prefix) +CONFIGURE_ARGS += --with-xsl=shared,$(prefix) +CONFIGURE_ARGS += --with-zlib-dir=$(prefix) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --enable-cli + +ifeq ($(SAPI),ap2) +CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs +endif + +# Disable Tests (report submitted to PHP QA) +SKIPTEST = 1 +#ENABLE_CHECK = 0 +TEST_TARGET = test + +include gar/category.mk + +# they're using git now and ship a .gitignore that excludes aclocal.m4 +# that broke one of our patches so we'll nuke .gitignore before we patch +pre-patch-modulated: + @(cd $(WORKSRC); rm .gitignore; git add -A; git commit -m 'adding files that were previously ignored' ) + @$(MAKECOOKIE) + +pre-configure-modulated: + @echo Munging c-client routine in configure. + @(cd $(WORKSRC); \ + perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \ + git add configure; git commit -m 'modify c-client finding routine') + @$(MAKECOOKIE) + +# this allows apxs to install the module. stupid, but i couldn't make +# the darn thing _not_ do try to add the httpd.conf lines, even with +# patching... +pre-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc +pre-install-modulated: $(PI_SCRIPTS) + @(mkdir -p $(DESTDIR)$(AP2SYSCONF); \ + cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) ) + @echo "LoadModule foo_module libexec/mod_foo.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo1_module libexec/mod_foo1.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf + @$(MAKECOOKIE) + +post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf +post-install-modulated: AP2EXTCONF=/opt/csw/apache2/etc/extra +post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini +post-install-modulated: + @rm -f $(DESTDIR)$(AP2SYSCONF) + @mkdir -p $(DESTDIR)$(AP2EXTCONF) + @cp $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF) + @cp $(WORKSRC)/php.ini-production $(INIDEST) + @ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/ + @perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST) + @rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f* + @perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf* + @mkdir -p $(DESTDIR)/opt/csw/bin + @( cd $(DESTDIR)/opt/csw/bin; \ + for f in pear peardev pecl phar php php-config; do \ + ln -s ../php5/bin/$$f $$f; \ + done ) + @$(MAKECOOKIE) + +post-merge: + @echo " ==> Fixing php.ini: adding loadable session.so support" + @( cd $(PKGROOT)/$(sysconfdir)/; \ + perl -pi -e 's/extension=bz2.so/extension=session.so\n;extension=bz2.so/' php.ini.CSW; ) + @( cd $(PKGROOT)/$(sysconfdir)/; \ + perl -pi -e 's/extension=bz2.so/extension=ctype.so\n;extension=bz2.so/' php.ini.CSW; ) + @echo " ==> Fixing php.ini: adding loadable ctype.so support" + @$(MAKECOOKIE) Copied: csw/mgar/pkg/php5/branches/php5-5.3.x/checksums (from rev 22078, csw/mgar/pkg/php5/trunk/checksums) =================================================================== --- csw/mgar/pkg/php5/branches/php5-5.3.x/checksums (rev 0) +++ csw/mgar/pkg/php5/branches/php5-5.3.x/checksums 2013-10-01 16:31:51 UTC (rev 22080) @@ -0,0 +1 @@ +347625ed7fbf2fe1f1c70b0f879fee2a php-5.3.25.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 18:44:38 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 16:44:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[22081] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 22081 http://gar.svn.sourceforge.net/gar/?rev=22081&view=rev Author: pfelecan Date: 2013-10-01 16:44:38 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/sphinx/trunk: - bump version to last upstream revision - prepare for dual Python 2 support Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-01 16:31:51 UTC (rev 22080) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-01 16:44:38 UTC (rev 22081) @@ -3,7 +3,7 @@ # $Id$ NAME = Sphinx -VERSION = 1.1.2 +VERSION = 1.1.3 PACKAGES = CSWpy-sphinx CATEGORIES = python GARTYPE = v2 @@ -12,10 +12,14 @@ endef DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-sphinx = 1 +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWpython27-dev DEP_PKGS += CSWpy-docutils DEP_PKGS += CSWpy-jinja2 DEP_PKGS += CSWpy-pygments DEP_PKGS += CSWpysetuptools +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS += CSWlibpython2-7-1-0 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 18:47:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 16:47:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[22082] csw/mgar/pkg/lang-python/sphinx/trunk/checksums Message-ID: Revision: 22082 http://gar.svn.sourceforge.net/gar/?rev=22082&view=rev Author: pfelecan Date: 2013-10-01 16:47:44 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/sphinx/trunk: - bump version to last upstream revision - prepare for dual Python 2 support Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/checksums Modified: csw/mgar/pkg/lang-python/sphinx/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/checksums 2013-10-01 16:44:38 UTC (rev 22081) +++ csw/mgar/pkg/lang-python/sphinx/trunk/checksums 2013-10-01 16:47:44 UTC (rev 22082) @@ -1 +1 @@ -b65a5d5d6172f3dcfefb4770ec63926e Sphinx-1.1.2.tar.gz +8f55a6d4f87fc6d528120c5d1f983e98 Sphinx-1.1.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 19:04:58 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 17:04:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[22083] csw/mgar/pkg/opencsw-manual/trunk/Makefile Message-ID: Revision: 22083 http://gar.svn.sourceforge.net/gar/?rev=22083&view=rev Author: pfelecan Date: 2013-10-01 17:04:58 +0000 (Tue, 01 Oct 2013) Log Message: ----------- opencsw-manual/trunk: - fix 2 insecure lines in the copy-to-web rule - opportunity to install anywhere Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-10-01 16:47:44 UTC (rev 22082) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-10-01 17:04:58 UTC (rev 22083) @@ -52,11 +52,13 @@ post-install-modulated: copy-to-web @$(MAKECOOKIE) +# define HTDOCS such as to be possible to install anywhere: +copy-to-web: HTDOCS = $(HOME)/public_html copy-to-web: if echo $(DESTDIR) | grep global; then :; else \ - if [ -d $(HOME)/public_html/opencsw-manual ]; then \ - rsync -r $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ - $(HOME)/public_html/opencsw-manual; \ + if [ -d $(HTDOCS)/opencsw-manual ]; then \ + rsync -r $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ + $(HTDOCS)/opencsw-manual; \ fi \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 1 19:36:28 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 01 Oct 2013 17:36:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22084] csw/mgar/pkg/lang-python/sphinx/trunk Message-ID: Revision: 22084 http://gar.svn.sourceforge.net/gar/?rev=22084&view=rev Author: pfelecan Date: 2013-10-01 17:36:28 +0000 (Tue, 01 Oct 2013) Log Message: ----------- lang-python/sphinx/trunk: - remove unnecessary dependencies - adapt a component to our file structure Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/sphinx/trunk/files/0001-fix-infodir.patch Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-01 17:04:58 UTC (rev 22083) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-01 17:36:28 UTC (rev 22084) @@ -11,6 +11,7 @@ define BLURB endef DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-fix-infodir.patch ARCHALL_CSWpy-sphinx = 1 BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpython27-dev @@ -18,8 +19,6 @@ DEP_PKGS += CSWpy-jinja2 DEP_PKGS += CSWpy-pygments DEP_PKGS += CSWpysetuptools -RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS += CSWlibpython2-7-1-0 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments Added: csw/mgar/pkg/lang-python/sphinx/trunk/files/0001-fix-infodir.patch =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/files/0001-fix-infodir.patch (rev 0) +++ csw/mgar/pkg/lang-python/sphinx/trunk/files/0001-fix-infodir.patch 2013-10-01 17:36:28 UTC (rev 22084) @@ -0,0 +1,25 @@ +From 7dd31a5801abe68b2b85055ea3fbc79f5422ed4e Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 1 Oct 2013 19:21:39 +0200 +Subject: [PATCH] fix infodir + +--- + sphinx/builders/texinfo.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sphinx/builders/texinfo.py b/sphinx/builders/texinfo.py +index 535c527..dbff6d2 100644 +--- a/sphinx/builders/texinfo.py ++++ b/sphinx/builders/texinfo.py +@@ -29,7 +29,7 @@ from sphinx.writers.texinfo import TexinfoWriter + TEXINFO_MAKEFILE = '''\ + # Makefile for Sphinx Texinfo output + +-infodir ?= /usr/share/info ++infodir ?= /opt/csw/share/info + + MAKEINFO = makeinfo --no-split + MAKEINFO_html = makeinfo --no-split --html +-- +1.8.3.4 + 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 Oct 1 19:52:43 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 01 Oct 2013 17:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[22085] csw/mgar/pkg/ansible/trunk Message-ID: Revision: 22085 http://gar.svn.sourceforge.net/gar/?rev=22085&view=rev Author: guengel Date: 2013-10-01 17:52:43 +0000 (Tue, 01 Oct 2013) Log Message: ----------- ansible/trunk: Added README.CSW and sample ansible hosts file. Fixed REINPLACE. Only build for python 2.6 due to missing python libraries in 2.7. Added patch to amend sbin_paths variable. Fixed misspelled GAR variables. Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch csw/mgar/pkg/ansible/trunk/files/README.CSW csw/mgar/pkg/ansible/trunk/files/hosts.CSW Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2013-10-01 17:36:28 UTC (rev 22084) +++ csw/mgar/pkg/ansible/trunk/Makefile 2013-10-01 17:52:43 UTC (rev 22085) @@ -12,19 +12,29 @@ MASTER_SITES = $(GITHUB_MIRROR) DISTNAME = $(GITHUB_USER)-$(NAME)-9d5d88b DISTFILES = $(GITHUB_REFERENCE)$(GITHUB_BALL_EXT) +DISTFILES += README.CSW +DISTFILES += hosts.CSW +PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch + PACKAGES = CSWansible CATALOGNAME = ansible -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/module_common.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/ansible/callbacks.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/playbook/__init__.py -CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/ansible/runner/__init__.py CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_ +# There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files. +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_common.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/callbacks.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/playbook/__init__.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/runner/__init__.py + +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 + REINPLACEMENTS = etc REINPLACE_MATCH_etc = /etc/ansible -REINPLACE_WITH_etc = /opt/csw/ansible +REINPLACE_WITH_etc = /etc/opt/csw/ansible REINPLACE_FILES_etc = lib/ansible/constants.py REINPLACEMENTS += usr @@ -32,16 +42,16 @@ REINPLACE_WITH_usr = /opt/csw/share/ansible REINPLACE_FILES_usr = lib/ansible/constants.py -RUNTIME_PKG_DEPS = CSWpy-jinja2 -RUNTIME_PKG_DEPS += CSWpy-yaml -RUNTIME_PKG_DEPS += CSWopenssh-client +RUNTIME_DEP_PKGS = CSWpy-jinja2 +RUNTIME_DEP_PKGS += CSWpy-yaml +RUNTIME_DEP_PKGS += CSWopenssh-client ARCHALL = 1 TEST_SCRIPTS = LICENSE = COPYING -MODULATIONS_PYTHON_VERSION = 2_7 +MODULATIONS_PYTHON_VERSION = 2_6 include gar/category.mk @@ -50,4 +60,8 @@ mv $(PKGROOT)/usr/share $(PKGROOT)$(prefix)/share ; \ rmdir $(PKGROOT)/usr || exit 1 ; \ fi + if [ ! -d $(PKGROOT)$(sysconfdir)/ansible ] ; then \ + ginstall -d $(PKGROOT)$(sysconfdir)/ansible ; \ + fi + cp $(FILEDIR)/hosts.CSW $(PKGROOT)$(sysconfdir)/ansible/ @$(MAKECOOKIE) Added: csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch =================================================================== --- csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch (rev 0) +++ csw/mgar/pkg/ansible/trunk/files/0003-Extended-sbin_paths-by-opt-csw-sbin.patch 2013-10-01 17:52:43 UTC (rev 22085) @@ -0,0 +1,25 @@ +From cd7a83573c952d9f8fc63cab2c7f5623663ecff6 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 1 Oct 2013 16:52:39 +0200 +Subject: [PATCH] Extended sbin_paths by '/opt/csw/sbin'. + +--- + lib/ansible/module_common.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py +index 55f184f..02aaf56 100644 +--- a/lib/ansible/module_common.py ++++ b/lib/ansible/module_common.py +@@ -740,7 +740,7 @@ class AnsibleModule(object): + - opt_dirs: optional list of directories to search in addition to PATH + if found return full path; otherwise return None + ''' +- sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin'] ++ sbin_paths = ['/sbin', '/usr/sbin', '/usr/local/sbin', '/opt/csw/sbin'] + paths = [] + for d in opt_dirs: + if d is not None and os.path.exists(d): +-- +1.8.3.4 + Added: csw/mgar/pkg/ansible/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/ansible/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/ansible/trunk/files/README.CSW 2013-10-01 17:52:43 UTC (rev 22085) @@ -0,0 +1,19 @@ +Note +==== + +OpenCSW Ansible does not support Paramiko as a connection method, due +to lack of a Paramiko OpenCSW package. Therefore, OpenCSW Ansible +requires an SSH implementation supporting ControlPersist +functionality, which is provided by the OpenCSW OpenSSH Client +package. + +In order to make to make use of the OpenCSW OpenSSH Client, please +make sure /opt/csw/bin is listed before /usr/bin in your PATH +environment variable, e.g. + + + PATH=/opt/csw/bin:$PATH ansible ... + + +Or you might follow the instructions given in the section `Setting +your PATH' on http://www.opencsw.org/use-it/. Added: csw/mgar/pkg/ansible/trunk/files/hosts.CSW =================================================================== --- csw/mgar/pkg/ansible/trunk/files/hosts.CSW (rev 0) +++ csw/mgar/pkg/ansible/trunk/files/hosts.CSW 2013-10-01 17:52:43 UTC (rev 22085) @@ -0,0 +1,44 @@ +# This is the default ansible 'hosts' file. +# +# It should live in /etc/opt/csw/ansible/hosts +# +# - Comments begin with the '#' character +# - Blank lines are ignored +# - Groups of hosts are delimited by [header] elements +# - You can enter hostnames or ip addresses +# - A hostname/ip can be a member of multiple groups + +# Ex 1: Ungrouped hosts, specify before any group headers. + +green.example.com +blue.example.com +192.168.100.1 +192.168.100.10 + +# Ex 2: A collection of hosts belonging to the 'webservers' group + +[webservers] +alpha.example.org +beta.example.org +192.168.1.100 +192.168.1.110 + +# If you have multiple hosts following a pattern you can specify +# them like this: + +www[001:006].example.com + +# Ex 3: A collection of database servers in the 'dbservers' group + +[dbservers] + +db01.intranet.mydomain.net +db02.intranet.mydomain.net +10.25.1.56 +10.25.1.57 + +# Here's another example of host ranges, this time there are no +# leading 0s: + +db-[99:101]-node.example.com + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Tue Oct 1 20:01:26 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Tue, 01 Oct 2013 20:01:26 +0200 Subject: [csw-devel] SF.net SVN: gar:[22085] csw/mgar/pkg/ansible/trunk In-Reply-To: (guengel@users.sourceforge.net's message of "Tue, 01 Oct 2013 17:52:43 +0000") References: Message-ID: guengel at users.sourceforge.net writes: > ansible/trunk: [...] Only build for python 2.6 due to missing python > libraries in 2.7 [...] What do you mean by this? Do you care to explain? -- Peter From lblume at users.sourceforge.net Tue Oct 1 23:26:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 01 Oct 2013 21:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[22086] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: Revision: 22086 http://gar.svn.sourceforge.net/gar/?rev=22086&view=rev Author: lblume Date: 2013-10-01 21:26:43 +0000 (Tue, 01 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump version to 5.6.14 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-10-01 17:52:43 UTC (rev 22085) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-10-01 21:26:43 UTC (rev 22086) @@ -19,7 +19,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.6 -PATCHLEVEL = 13 +PATCHLEVEL = 14 ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 2 08:48:53 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 02 Oct 2013 06:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22087] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Message-ID: Revision: 22087 http://gar.svn.sourceforge.net/gar/?rev=22087&view=rev Author: lblume Date: 2013-10-02 06:48:53 +0000 (Wed, 02 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Makesum done Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-10-01 21:26:43 UTC (rev 22086) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-10-02 06:48:53 UTC (rev 22087) @@ -1 +1 @@ -4bfeb22f2f876825db70d9820d164343 mysql-5.6.13.tar.gz +52224ce51dbf6ffbcef82be30688cc04 mysql-5.6.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 09:53:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 07:53:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[22088] csw/mgar/pkg/lang-python/calibre/trunk/Makefile Message-ID: Revision: 22088 http://gar.svn.sourceforge.net/gar/?rev=22088&view=rev Author: pfelecan Date: 2013-10-02 07:53:06 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/calibre/trunk: - add new run-time dependencies - introduce our prefix to soem paths Modified Paths: -------------- csw/mgar/pkg/lang-python/calibre/trunk/Makefile Modified: csw/mgar/pkg/lang-python/calibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 06:48:53 UTC (rev 22087) +++ csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 07:53:06 UTC (rev 22088) @@ -6,9 +6,9 @@ PYTHON_VERSION = 2_7 GARTYPE = v2 -DESCRIPTION = e-book converter and library management +DESCRIPTION = An e-book converter and library management define BLURB - calibre is an e-book manager. It can view, convert and catalog e-books + Calibre is an e-book manager. It can view, convert and catalog e-books in all of the major e-book formats. It can also talk to e-book reader devices. It can go out to the internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient @@ -24,6 +24,7 @@ PATCHFILES += 0001-solaris-extensions.patch PATCHFILES += 0002-add-timer-macros.patch PATCHFILES += 0003-endianness-and-byte-order.patch +PATCHFILES += 0004-introduce-CSW-prefix-in-some-paths.patch BUILD_DEP_PKGS += CSWpy-sip BUILD_DEP_PKGS += CSWpython27-dev @@ -53,6 +54,20 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibchm0 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtdbus4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtsvg4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpodofo0-9-1 RUNTIME_DEP_PKGS_CSWcalibre = CSWxdg-utils CHECKPKG_OVERRIDES_CSWcalibre += surplus-dependency|CSWxdg-utils include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 10:15:59 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 08:15:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[22089] csw/mgar/pkg/lang-python/calibre/trunk/files/ 0004-introduce-CSW-prefix-in-some-paths.patch Message-ID: Revision: 22089 http://gar.svn.sourceforge.net/gar/?rev=22089&view=rev Author: pfelecan Date: 2013-10-02 08:15:58 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/calibre/trunk: also add the pathc wich introduce our prefix to some paths Added Paths: ----------- csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch Added: csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch (rev 0) +++ csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch 2013-10-02 08:15:58 UTC (rev 22089) @@ -0,0 +1,66 @@ +From 6a605c24c3a27678541e9ffa76aff78a03cb2a9e Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 2 Oct 2013 09:46:08 +0200 +Subject: [PATCH] introduce CSW prefix in some paths + +--- + src/calibre/ebooks/lrf/fonts/__init__.py | 2 +- + src/calibre/linux.py | 6 +++--- + src/calibre/utils/fonts/scanner.py | 3 +-- + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py +index 3f16936..13a4507 100644 +--- a/src/calibre/ebooks/lrf/fonts/__init__.py ++++ b/src/calibre/ebooks/lrf/fonts/__init__.py +@@ -12,7 +12,7 @@ except ImportError: + Default fonts used in the PRS500 + ''' + +-SYSTEM_FONT_PATH = '/usr/share/fonts/truetype/ttf-liberation/' ++SYSTEM_FONT_PATH = '/opt/csw/share/fonts/truetype/ttf-liberation/' + + FONT_MAP = { + 'Swis721 BT Roman' : 'tt0003m_', +diff --git a/src/calibre/linux.py b/src/calibre/linux.py +index 41af312..615443f 100644 +--- a/src/calibre/linux.py ++++ b/src/calibre/linux.py +@@ -46,7 +46,7 @@ class PreserveMIMEDefaults(object): + self.initial_values = {} + + def __enter__(self): +- def_data_dirs = '/usr/local/share:/usr/share' ++ def_data_dirs = '/opt/csw/share:/usr/share' + paths = os.environ.get('XDG_DATA_DIRS', def_data_dirs) + paths = paths.split(':') + paths.append(os.environ.get('XDG_DATA_HOME', os.path.expanduser( +@@ -131,8 +131,8 @@ class ZshCompleter(object): # {{{ + base = os.path.dirname(self.opts.staging_sharedir) + self.detect_zsh(base) + if not self.dest and base == '/usr/share': +- # Ubuntu puts site-functions in /usr/local/share +- self.detect_zsh('/usr/local/share') ++ # Ubuntu puts site-functions in / usr / local /share ++ self.detect_zsh('/opt/csw/share') + + self.commands = {} + +diff --git a/src/calibre/utils/fonts/scanner.py b/src/calibre/utils/fonts/scanner.py +index b562898..19ce032 100644 +--- a/src/calibre/utils/fonts/scanner.py ++++ b/src/calibre/utils/fonts/scanner.py +@@ -23,9 +23,8 @@ class NoFonts(ValueError): + + def default_font_dirs(): + return [ +- '/opt/share/fonts', ++ '/opt/csw/share/fonts', + '/usr/share/fonts', +- '/usr/local/share/fonts', + os.path.expanduser('~/.local/share/fonts'), + os.path.expanduser('~/.fonts') + ] +-- +1.8.3.4 + 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 Oct 2 10:22:34 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Oct 2013 08:22:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[22090] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 22090 http://gar.svn.sourceforge.net/gar/?rev=22090&view=rev Author: dmichelsen Date: 2013-10-02 08:22:33 +0000 (Wed, 02 Oct 2013) Log Message: ----------- sudo/trunk: Update to 1.8.8 and remove obsolete overrides Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo/trunk/checksums Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2013-10-02 08:15:58 UTC (rev 22089) +++ csw/mgar/pkg/sudo/trunk/Makefile 2013-10-02 08:22:33 UTC (rev 22090) @@ -2,7 +2,7 @@ # NAME = sudo -VERSION = 1.8.7 +VERSION = 1.8.8 GARTYPE = v2 EXTRA_MODULATORS = LDAP @@ -43,14 +43,7 @@ OBSOLETED_BY_CSWsudo = CSWsudo-common # These are just docs -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1m/sudo.1m -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/man/man4/sudoers.4 -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/UPGRADE -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/sample.sudoers -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/TROUBLESHOOTING -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/ChangeLog CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/local|root/etc/opt/csw/sudoers.CSW -CHECKPKG_OVERRIDES_CSWsudo += file-with-bad-content|/usr/share|root/opt/csw/share/doc/sudo/ChangeLog # This is a private library CHECKPKG_OVERRIDES_CSWsudo += soname-not-part-of-filename|soname=libsudo_noexec.so|filename=sudo_noexec.so @@ -76,7 +69,6 @@ CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWsudo OBSOLETED_BY_CSWsudo-ldap += CSWsudoldap CATALOGNAME_CSWsudoldap = sudo_ldap_stub -CHECKPKG_OVERRIDES_CSWsudo-ldap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/sudo/README.LDAP #on solaris9 this is still a dep. Should be checked CHECKPKG_OVERRIDES_CSWsudo-ldap += surplus-dependency|CSWliblber2-4-2 Modified: csw/mgar/pkg/sudo/trunk/checksums =================================================================== --- csw/mgar/pkg/sudo/trunk/checksums 2013-10-02 08:15:58 UTC (rev 22089) +++ csw/mgar/pkg/sudo/trunk/checksums 2013-10-02 08:22:33 UTC (rev 22090) @@ -1 +1 @@ -a02367090e1dac8d0c1747de1127b6bf sudo-1.8.7.tar.gz +fc4f074090afd56d9ff4ff4e97321971 sudo-1.8.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 2 10:52:08 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 02 Oct 2013 08:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[22091] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22091 http://gar.svn.sourceforge.net/gar/?rev=22091&view=rev Author: dmichelsen Date: 2013-10-02 08:52:08 +0000 (Wed, 02 Oct 2013) Log Message: ----------- gcc4/trunk: Readd libiconv Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-02 08:22:33 UTC (rev 22090) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-02 08:52:08 UTC (rev 22091) @@ -47,6 +47,7 @@ BUILD_DEP_PKGS += CSWlibmpfr-dev BUILD_DEP_PKGS += CSWlibppl-dev BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibiconv-dev # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix PROGRAM_SUFFIX = -$(BASE_VERSION) @@ -125,6 +126,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWcoreutils RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWggrep RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibiconv2 ALTERNATIVES_$(PKG_BASENAME)core += $(PKG_VERSION_TOKEN)core ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) @@ -154,7 +156,6 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += discouraged-path-in-pkgmap CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += discouraged-path-in-pkgmap - CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap # Some static libraries are required to build binaries with gcc, for example @@ -211,7 +212,6 @@ SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1 - PACKAGES += CSWlibobjc$(LIBOBJC) CATALOGNAME_CSWlibobjc$(LIBOBJC) = libobjc$(LIBOBJC) PKGFILES_CSWlibobjc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc\.so\.$(LIBOBJC)(\.\d+)*) @@ -285,6 +285,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibiconv2 # The C++ compiler needs the C compiler. RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(PKG_BASENAME)core @@ -310,6 +311,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2 ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) @@ -325,6 +327,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2 CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += surplus-dependency|CSWecj PKGFILES_$(PKG_BASENAME)java = $(foreach F,$(JAVA_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX)) @@ -402,6 +405,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2 PACKAGES += $(PKG_BASENAME)ada SPKG_DESC_$(PKG_BASENAME)ada = GCC Ada compiler (GNAT) @@ -423,6 +427,7 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 ALTERNATIVES_$(PKG_BASENAME)ada += $(PKG_VERSION_TOKEN)ada ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnat gcc_ada $(bindir)/gnat$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 10:59:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 08:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[22092] csw/mgar/pkg/lang-python/calibre/trunk Message-ID: Revision: 22092 http://gar.svn.sourceforge.net/gar/?rev=22092&view=rev Author: pfelecan Date: 2013-10-02 08:59:08 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/calibre/trunk: previous 2 commits where incorrect and/or incomplete Modified Paths: -------------- csw/mgar/pkg/lang-python/calibre/trunk/Makefile csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch Modified: csw/mgar/pkg/lang-python/calibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 08:52:08 UTC (rev 22091) +++ csw/mgar/pkg/lang-python/calibre/trunk/Makefile 2013-10-02 08:59:08 UTC (rev 22092) @@ -54,22 +54,26 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibchm0 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtdbus4 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtcore4 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibz1 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpython2-7-1-0 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtgui4 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtsvg4 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpodofo0-9-1 -RUNTIME_DEP_PKGS_CSWcalibre = CSWxdg-utils +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibchm0 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtdbus4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtcore4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtgui4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibqtsvg4 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWcalibre += CSWlibpodofo0-9-1 +RUNTIME_DEP_PKGS_CSWcalibre += CSWxdg-utils CHECKPKG_OVERRIDES_CSWcalibre += surplus-dependency|CSWxdg-utils +# I let the /usr/share as a fallback; /opt/csw/share is first anyway: +CHECKPKG_OVERRIDES_CSWcalibre += file-with-bad-content|/usr/share|root/opt/csw/lib/calibre/calibre/linux.py +CHECKPKG_OVERRIDES_CSWcalibre += file-with-bad-content|/usr/share|root/opt/csw/lib/calibre/calibre/utils/fonts/scanner.py + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch =================================================================== --- csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch 2013-10-02 08:52:08 UTC (rev 22091) +++ csw/mgar/pkg/lang-python/calibre/trunk/files/0004-introduce-CSW-prefix-in-some-paths.patch 2013-10-02 08:59:08 UTC (rev 22092) @@ -1,14 +1,38 @@ -From 6a605c24c3a27678541e9ffa76aff78a03cb2a9e Mon Sep 17 00:00:00 2001 +From 85e24e781d10c073c2b48e75e6e5bdcf04c1f365 Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Wed, 2 Oct 2013 09:46:08 +0200 +Date: Wed, 2 Oct 2013 10:50:45 +0200 Subject: [PATCH] introduce CSW prefix in some paths --- + src/calibre/devices/kobo/driver.py | 4 ++-- src/calibre/ebooks/lrf/fonts/__init__.py | 2 +- src/calibre/linux.py | 6 +++--- src/calibre/utils/fonts/scanner.py | 3 +-- - 3 files changed, 5 insertions(+), 6 deletions(-) + src/unrar/pathfn.cpp | 2 +- + 5 files changed, 8 insertions(+), 9 deletions(-) +diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py +index cb325ef..38f7d34 100644 +--- a/src/calibre/devices/kobo/driver.py ++++ b/src/calibre/devices/kobo/driver.py +@@ -314,7 +314,7 @@ class KOBO(USBMS): + changed = False + for i, row in enumerate(cursor): + # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...')) +- if not hasattr(row[3], 'startswith') or row[3].startswith("file:///usr/local/Kobo/help/"): ++ if not hasattr(row[3], 'startswith') or row[3].startswith("file:///opt/csw/share/Kobo/help/"): + # These are internal to the Kobo device and do not exist + continue + path = self.path_from_contentid(row[3], row[5], row[4], oncard) +@@ -1706,7 +1706,7 @@ class KOBOTOUCH(KOBO): + debug_print("KoboTouch:books - looping on database - row=%d" % i) + debug_print("KoboTouch:books - title='%s'"%row[0], "authors=", row[1]) + debug_print("KoboTouch:books - row=", row) +- if not hasattr(row[3], 'startswith') or row[3].lower().startswith("file:///usr/local/kobo/help/") or row[3].lower().startswith("/usr/local/kobo/help/"): ++ if not hasattr(row[3], 'startswith') or row[3].lower().startswith("file:///opt/csw/share/kobo/help/") or row[3].lower().startswith("/opt/csw/share/kobo/help/"): + # These are internal to the Kobo device and do not exist + continue + externalId = None if row[15] and len(row[15]) == 0 else row[15] diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py index 3f16936..13a4507 100644 --- a/src/calibre/ebooks/lrf/fonts/__init__.py @@ -61,6 +85,19 @@ os.path.expanduser('~/.local/share/fonts'), os.path.expanduser('~/.fonts') ] +diff --git a/src/unrar/pathfn.cpp b/src/unrar/pathfn.cpp +index b9244cd..be3a421 100644 +--- a/src/unrar/pathfn.cpp ++++ b/src/unrar/pathfn.cpp +@@ -448,7 +448,7 @@ bool EnumConfigPaths(char *Path,int Number) + return(true); + #elif defined(_UNIX) + static const char *AltPath[]={ +- "/etc","/etc/rar","/usr/lib","/usr/local/lib","/usr/local/etc" ++ "/opt/csw/lib", "/opt/csw/etc", "/etc","/etc/rar","/usr/lib" + }; + if (Number==0) + { -- 1.8.3.4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 15:05:45 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 13:05:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[22093] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 22093 http://gar.svn.sourceforge.net/gar/?rev=22093&view=rev Author: pfelecan Date: 2013-10-02 13:05:43 +0000 (Wed, 02 Oct 2013) Log Message: ----------- guile/trunk: - removed some unused overrides - moved other overrides as the components distribution among packages changed Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-10-02 08:59:08 UTC (rev 22092) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-10-02 13:05:43 UTC (rev 22093) @@ -45,15 +45,6 @@ CATALOGNAME_CSWguile = guile SPKG_DESC_CSWguile += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWguile += CSWlibguile2-0-22 -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-4 -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-5 -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-1 -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-4 -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-1 -# even though I replace it in the sources ... -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/lib/guile/2.0/ccache/ice-9/slib.go -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/guile/2.0/ccache/ice-9/slib.go -CHECKPKG_OVERRIDES_CSWguile += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/guile/2.0/ccache/ice-9/slib.go PACKAGES += CSWlibguile2-0-22 CATALOGNAME_CSWlibguile2-0-22 = libguile2_0_22 @@ -73,7 +64,9 @@ RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibgmp10 RUNTIME_DEP_PKGS_CSWlibguile2-0-22 += CSWlibffi4 -# overrides for the old libraries: +CHECKPKG_OVERRIDES_CSWlibguile2-0-22 += file-with-bad-content|/usr/share|root/opt/csw/lib/guile/2.0/ccache/ice-9/slib.go +CHECKPKG_OVERRIDES_CSWlibguile2-0-22 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/guile/2.0/ccache/ice-9/slib.go +CHECKPKG_OVERRIDES_CSWlibguile2-0-22 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/guile/2.0/ccache/ice-9/slib.go PACKAGES += CSWlibguilereadline-v18-18 CATALOGNAME_CSWlibguilereadline-v18-18 = libguilereadline_v18_18 @@ -108,7 +101,6 @@ CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/sparcv9/libguile.so.12.3.0 CHECKPKG_OVERRIDES_CSWlibguile12 += binary-disallowed-placement|file=opt/csw/lib/amd64/libguile.so.12.3.0|arch_id=3|arch_name=i386|bad_path=amd64 CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/amd64/libguile.so.12.3.0 -CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/sparcv9/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/amd64/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 CHECKPKG_OVERRIDES_CSWlibguile12 += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libguile.so.12.3.0|arch_id=2|arch_name=sparcv8|bad_path=sparcv9 @@ -124,7 +116,6 @@ RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguilereadline-v18-18 RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibguile2-0-22 RUNTIME_DEP_PKGS_CSWguile-dev += CSWlibgmp-dev -CHECKPKG_OVERRIDES_CSWguile-dev += surplus-dependency|CSWlibgmp-dev REINPLACE_WHEN_USRLOCAL = postinstall REINPLACE_USRLOCAL += /opt/csw/share/guile/2.0/guile-procedures.txt 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 Oct 2 17:05:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Oct 2013 15:05:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[22094] csw/mgar/pkg/lang-python/distribute/trunk Message-ID: Revision: 22094 http://gar.svn.sourceforge.net/gar/?rev=22094&view=rev Author: wahwah Date: 2013-10-02 15:05:53 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/distribute/trunk: Manually add distribute_setup.py Modified Paths: -------------- csw/mgar/pkg/lang-python/distribute/trunk/Makefile csw/mgar/pkg/lang-python/distribute/trunk/checksums Modified: csw/mgar/pkg/lang-python/distribute/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-02 13:05:43 UTC (rev 22093) +++ csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-02 15:05:53 UTC (rev 22094) @@ -9,9 +9,15 @@ DESCRIPTION = This package is a simple compatibility layer that installs Setuptools 0.7+ +MASTER_SITES += http://python-distribute.org/ DISTFILES = $(DISTNAME).zip +DISTFILES += distribute_setup.py VENDOR_URL = https://pypi.python.org/pypi/distribute ARCHALL = 1 TEST_SCRIPTS = -PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +DEP_PKGS_CSWpy-distribute = CSWpy-setuptools include gar/category.mk + +post-install: + ginstall $(WORKDIR)/distribute_setup.py $(DESTDIR)$(PYTHON_SITE_PACKAGES) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/distribute/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/checksums 2013-10-02 13:05:43 UTC (rev 22093) +++ csw/mgar/pkg/lang-python/distribute/trunk/checksums 2013-10-02 15:05:53 UTC (rev 22094) @@ -1 +1,2 @@ c6c59594a7b180af57af8a0cc0cf5b4a distribute-0.7.3.zip +765e07c18a2c8af2f6d99a124e21824d distribute_setup.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Wed Oct 2 17:52:22 2013 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Wed, 02 Oct 2013 15:52:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[22095] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: Revision: 22095 http://gar.svn.sourceforge.net/gar/?rev=22095&view=rev Author: guillomovitch Date: 2013-10-02 15:52:21 +0000 (Wed, 02 Oct 2013) Log Message: ----------- fusioninventory-agent/trunk: new version 2.3.2 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2013-10-02 15:05:53 UTC (rev 22094) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2013-10-02 15:52:21 UTC (rev 22095) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.1 +VERSION = 2.3.2 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2013-10-02 15:05:53 UTC (rev 22094) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2013-10-02 15:52:21 UTC (rev 22095) @@ -1 +1 @@ -8b74e4411593a8b0fc4d7d5d97a969ce FusionInventory-Agent-2.3.1.tar.gz +da549c2b606b26cd6275a0ac57f9e415 FusionInventory-Agent-2.3.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 18:34:17 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 16:34:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22096] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 22096 http://gar.svn.sourceforge.net/gar/?rev=22096&view=rev Author: pfelecan Date: 2013-10-02 16:34:17 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/sphinx: add a sub-package containing the info files ant, if needed in the future, other formats Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 15:52:21 UTC (rev 22095) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:34:17 UTC (rev 22096) @@ -1,4 +1,4 @@ -# Copyright 2009 OpenCSW +# Copyright 2009-2013 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,9 +12,10 @@ endef DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-fix-infodir.patch -ARCHALL_CSWpy-sphinx = 1 + BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpython27-dev +BUILD_DEP_PKGS += CSWtexinfo DEP_PKGS += CSWpy-docutils DEP_PKGS += CSWpy-jinja2 DEP_PKGS += CSWpy-pygments @@ -23,4 +24,27 @@ CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpysetuptools + +PACKAGES += CSWpy-sphinx +CATALOGNAME_CSWpy-sphinx = py_sphinx +SPKG_DESC_CSWpy-sphinx += $(DESCRIPTION) +ARCHALL_CSWpy-sphinx = 1 + +PACKAGES += CSWpy-sphinx-doc +CATALOGNAME_CSWpy-sphinx-doc = py_sphinx_doc +SPKG_DESC_CSWpy-sphinx-doc += $(DESCRIPTION), documentation +PKGFILES_CSWpy-sphinx-doc += /opt/csw/share/info/.* +ARCHALL_CSWpy-sphinx-doc = 1 + include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +post-build: + cd $(WORKSRC)/doc && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) info + $(MAKECOOKIE) + +post-install: + ginstall -d "$(DESTDIR)$(infodir)" + cd $(WORKSRC)/doc/_build/texinfo && ginstall --preserve-timestamps --mode=u=rw,go=r *.info *.png $(DESTDIR)$(infodir) + $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 18:52:36 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 16:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[22097] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 22097 http://gar.svn.sourceforge.net/gar/?rev=22097&view=rev Author: pfelecan Date: 2013-10-02 16:52:36 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/sphinx: refine development and run-time dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:34:17 UTC (rev 22096) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:52:36 UTC (rev 22097) @@ -15,22 +15,26 @@ BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpython27-dev +BUILD_DEP_PKGS += CSWpy-docutils +BUILD_DEP_PKGS += CSWpy-jinja2 +BUILD_DEP_PKGS += CSWpy-pygments +BUILD_DEP_PKGS += CSWpysetuptools BUILD_DEP_PKGS += CSWtexinfo -DEP_PKGS += CSWpy-docutils -DEP_PKGS += CSWpy-jinja2 -DEP_PKGS += CSWpy-pygments -DEP_PKGS += CSWpysetuptools -CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils -CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 -CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments -CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpysetuptools PACKAGES += CSWpy-sphinx CATALOGNAME_CSWpy-sphinx = py_sphinx SPKG_DESC_CSWpy-sphinx += $(DESCRIPTION) ARCHALL_CSWpy-sphinx = 1 +RUNTIME_DEP_PKGS += CSWpy-docutils +RUNTIME_DEP_PKGS += CSWpy-jinja2 +RUNTIME_DEP_PKGS += CSWpy-pygments +RUNTIME_DEP_PKGS += CSWpysetuptools +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments +CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpysetuptools -PACKAGES += CSWpy-sphinx-doc +PACKAGES += CSWpy-sphinx-doc CATALOGNAME_CSWpy-sphinx-doc = py_sphinx_doc SPKG_DESC_CSWpy-sphinx-doc += $(DESCRIPTION), documentation PKGFILES_CSWpy-sphinx-doc += /opt/csw/share/info/.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 18:54:30 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 16:54:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[22098] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 22098 http://gar.svn.sourceforge.net/gar/?rev=22098&view=rev Author: pfelecan Date: 2013-10-02 16:54:30 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/sphinx: documentation package is not dual Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:52:36 UTC (rev 22097) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:54:30 UTC (rev 22098) @@ -34,11 +34,12 @@ CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpysetuptools -PACKAGES += CSWpy-sphinx-doc -CATALOGNAME_CSWpy-sphinx-doc = py_sphinx_doc -SPKG_DESC_CSWpy-sphinx-doc += $(DESCRIPTION), documentation -PKGFILES_CSWpy-sphinx-doc += /opt/csw/share/info/.* -ARCHALL_CSWpy-sphinx-doc = 1 +PACKAGES += CSWpy-sphinx-doc +CATALOGNAME_CSWpy-sphinx-doc = py_sphinx_doc +SPKG_DESC_CSWpy-sphinx-doc += $(DESCRIPTION), documentation +PKGFILES_CSWpy-sphinx-doc += /opt/csw/share/info/.* +ARCHALL_CSWpy-sphinx-doc = 1 +CHECKPKG_OVERRIDES_CSWpy-sphinx-doc += python-package-missing-py26-files include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 19:06:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 17:06:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[22099] csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Message-ID: Revision: 22099 http://gar.svn.sourceforge.net/gar/?rev=22099&view=rev Author: pfelecan Date: 2013-10-02 17:06:21 +0000 (Wed, 02 Oct 2013) Log Message: ----------- lang-python/sphinx: the run-time dependencies are only for the main package Modified Paths: -------------- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 16:54:30 UTC (rev 22098) +++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile 2013-10-02 17:06:21 UTC (rev 22099) @@ -25,10 +25,10 @@ CATALOGNAME_CSWpy-sphinx = py_sphinx SPKG_DESC_CSWpy-sphinx += $(DESCRIPTION) ARCHALL_CSWpy-sphinx = 1 -RUNTIME_DEP_PKGS += CSWpy-docutils -RUNTIME_DEP_PKGS += CSWpy-jinja2 -RUNTIME_DEP_PKGS += CSWpy-pygments -RUNTIME_DEP_PKGS += CSWpysetuptools +RUNTIME_DEP_PKGS_CSWpy-sphinx += CSWpy-docutils +RUNTIME_DEP_PKGS_CSWpy-sphinx += CSWpy-jinja2 +RUNTIME_DEP_PKGS_CSWpy-sphinx += CSWpy-pygments +RUNTIME_DEP_PKGS_CSWpy-sphinx += CSWpysetuptools CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 2 19:26:06 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 02 Oct 2013 17:26:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[22100] csw/mgar/pkg/opencsw-manual/trunk Message-ID: Revision: 22100 http://gar.svn.sourceforge.net/gar/?rev=22100&view=rev Author: pfelecan Date: 2013-10-02 17:26:06 +0000 (Wed, 02 Oct 2013) Log Message: ----------- opencsw-manual/trunk: start the verification with a syntactically correct source Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/Makefile csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/Makefile 2013-10-02 17:26:06 UTC (rev 22100) @@ -57,7 +57,7 @@ copy-to-web: if echo $(DESTDIR) | grep global; then :; else \ if [ -d $(HTDOCS)/opencsw-manual ]; then \ - rsync -r $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ + rsync -rv $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \ $(HTDOCS)/opencsw-manual; \ fi \ fi Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-02 17:26:06 UTC (rev 22100) @@ -56,9 +56,9 @@ Voila! You have installed your first package! ------------------- +--------------------------------------------- Selecting your mirror and the catalog release ------------------- +--------------------------------------------- Now that you are about to install lots of stuff it may be a good time to select one of the mirrors from ``mirror.opencsw.org`` close to you. The official Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst 2013-10-02 17:26:06 UTC (rev 22100) @@ -9,7 +9,7 @@ introduction getting-started - installing-en-masse + installation-en-masse configuring-services mirror-setup Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/installation-en-masse.rst 2013-10-02 17:26:06 UTC (rev 22100) @@ -1,6 +1,6 @@ -========================== +============================ Installing packages en masse -========================== +============================ -------------------- Package dependencies Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 17:26:06 UTC (rev 22100) @@ -4,10 +4,10 @@ .. highlight:: text - If you prefer a video tutorial instead of a written document, there is - a `packaging video tutorial`_ available. It covers a subset of this document, - starting from a fresh Solaris 10 install and ends with a built package. It - takes about 2-3h to complete. +If you prefer a video tutorial instead of a written document, there is +a `packaging video tutorial`_ available. It covers a subset of this document, +starting from a fresh Solaris 10 install and ends with a built package. It +takes about 2-3h to complete. A buildfarm is a set of hosts where you can build Solaris packages. You can connect Intel and SPARC hosts together to build a set of packages with one Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-10-02 17:06:21 UTC (rev 22099) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/building-a-catalog.rst 2013-10-02 17:26:06 UTC (rev 22100) @@ -9,14 +9,14 @@ pkgutil, but there isn't an existing catalog that provides you with the right mix. The typical cases include: -# You've built a set of packages and you want to test them. -# You want to pick a subset of packages from an existing catalog on the - mirror. -# You want to install older versions of some packages, for instance pick a few - packages from the old package stash (``allpkgs``) and some other, newer - packages. -# You have a set of packages internal to your company that you want to - distribute across your servers. +#. You've built a set of packages and you want to test them. +#. You want to pick a subset of packages from an existing catalog on the + mirror. +#. You want to install older versions of some packages, for instance pick a few + packages from the old package stash (``allpkgs``) and some other, newer + packages. +#. You have a set of packages internal to your company that you want to + distribute across your servers. How to build your own catalog ----------------------------- 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 Oct 2 23:44:19 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 02 Oct 2013 21:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[22101] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 22101 http://gar.svn.sourceforge.net/gar/?rev=22101&view=rev Author: jake_goerzen Date: 2013-10-02 21:44:18 +0000 (Wed, 02 Oct 2013) Log Message: ----------- dovecot: switch compiler from SOS12 to GCC4 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-10-02 17:26:06 UTC (rev 22100) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-10-02 21:44:18 UTC (rev 22101) @@ -18,7 +18,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = SOS12 +GARCOMPILER = GCC4 PACKAGES = CSWdovecot CSWdovecot-dev 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 Oct 2 23:48:50 2013 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 02 Oct 2013 21:48:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[22102] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 22102 http://gar.svn.sourceforge.net/gar/?rev=22102&view=rev Author: jake_goerzen Date: 2013-10-02 21:48:50 +0000 (Wed, 02 Oct 2013) Log Message: ----------- dovecot: add dependancy CSWlibgcc-s1 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2013-10-02 21:44:18 UTC (rev 22101) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2013-10-02 21:48:50 UTC (rev 22102) @@ -41,6 +41,7 @@ RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWdovecot += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWdovecot += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWdovecot += CSWlibgcc-s1 PKGFILES_CSWdovecot-dev = $(PKGFILES_DEVEL) 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 Oct 3 01:21:01 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Oct 2013 23:21:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[22103] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22103 http://gar.svn.sourceforge.net/gar/?rev=22103&view=rev Author: wahwah Date: 2013-10-02 23:21:00 +0000 (Wed, 02 Oct 2013) Log Message: ----------- opencsw-manual/trunk: annotated required and optional steps Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 21:48:50 UTC (rev 22102) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 23:21:00 UTC (rev 22103) @@ -34,8 +34,8 @@ A typical location is ``/export/mirror/opencsw``. -Base setup ----------- +Base setup (required) +--------------------- The base setup is enough to build packages but does not allow to automatically check your packages for errors. @@ -44,8 +44,8 @@ sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo -Oracle Solaris Studio Compiler -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Oracle Solaris Studio Compiler (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You need a compiler. Most of the packages built by OpenCSW use Oracle Solaris Studio (historically called 'SOS'), which you can `download from Oracle`_. You @@ -70,16 +70,16 @@ SOS12_CC_HOME = /opt/studio12/SUNWspro -Installing Oracle Solaris Studio 12 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Installing Oracle Solaris Studio 12 (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: cd ss12 ./batch_installer -d /opt/studio/SOS12 --accept-sla -Installing Oracle Solaris Studio 12u3 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Installing Oracle Solaris Studio 12u3 (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: @@ -91,8 +91,8 @@ Remember to patch the compilers, with PCA or manually (requires a software service contract from Oracle). -Setup ``~/.garrc`` -^^^^^^^^^^^^^^^^^^ +Setup ``~/.garrc`` (required) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Finally, you need to create your personal ``~/.garrc`` configuration file. It contains your name and e-mail adress, both of which are included in the @@ -130,8 +130,8 @@ it needs change please subscribe to the `users mailing list`_ and discuss your change there. -Basic git configuration -^^^^^^^^^^^^^^^^^^^^^^^ +Basic git configuration (required) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Git will be installed as one of dependencies. It is used by GAR to make source patching easier. Provide basic configuration for git: @@ -152,8 +152,8 @@ Of course, it can be your editor of choice. -Initialize the source tree -^^^^^^^^^^^^^^^^^^^^^^^^^^ +Initialize the source tree (required) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ As regular user (do not use ``root`` for safety reasons) to be used for building init your local repository: @@ -170,9 +170,11 @@ mgar up --all -checkpkg database ------------------ +checkpkg database (optional) +---------------------------- +Necessary if you want to check your packages for errors using ``checkpkg``. + You can use any database engine supported by sqlobject. MySQL and sqlite have been tested. @@ -276,8 +278,8 @@ Your database is now ready. -Multi-host setup ----------------- +Multi-host setup (optional) +--------------------------- How to set up hosts allowing you to build for both Intel and SPARC architectures. At least three servers are needed: @@ -305,8 +307,8 @@ .. _matrix of packages installed on the buildfarm: http://buildfarm.opencsw.org/versionmatrix.html -System-wide garrc -^^^^^^^^^^^^^^^^^ +System-wide garrc (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ System-wide ``garrc`` is useful when you have multiple users, for example colleagues at work who also build packages. It can also contain information @@ -349,8 +351,8 @@ SOS12_CC_HOME = /opt/SUNWspro -Installing Software -^^^^^^^^^^^^^^^^^^^ +Installing Software (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All software is archived and available from ``/home/farm`` on the buildfarm. Make sure you deinstall ``SUNWgmake``. That version is outdated and misses @@ -518,8 +520,8 @@ It seems the 32 bit and 64 bit clients can not be installed in the same directory. -Buildfarm web app ------------------ +Buildfarm web app (optional) +---------------------------- pkgdb-web is a web app on which you can browse your package database and inspect package metadata without having to unpack and examine packages in the @@ -538,8 +540,8 @@ There are specifically two web apps: One is read-only (``pkgdb_web.py``) and one is read-write (``releases_web.py``). -Catalog generation ------------------- +Catalog generation (optional) +----------------------------- Once you have the buildfarm database, you can generate your own package catalogs. The main entry point which you can add to cron is the @@ -548,8 +550,8 @@ * Source code: https://sourceforge.net/p/opencsw/code/HEAD/tree/buildfarm/bin/ -Catalog signing daemon ----------------------- +Catalog signing daemon (optional) +--------------------------------- Catalog signing daemon is useful if you wish to automatically sign your built catalogs with a GPG key. 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 Oct 3 01:35:31 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 02 Oct 2013 23:35:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[22104] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22104 http://gar.svn.sourceforge.net/gar/?rev=22104&view=rev Author: wahwah Date: 2013-10-02 23:35:30 +0000 (Wed, 02 Oct 2013) Log Message: ----------- opencsw-manual/trunk: Reshuffle the optional stuff Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 23:21:00 UTC (rev 22103) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-02 23:35:30 UTC (rev 22104) @@ -44,53 +44,6 @@ sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo -Oracle Solaris Studio Compiler (optional) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -You need a compiler. Most of the packages built by OpenCSW use Oracle Solaris -Studio (historically called 'SOS'), which you can `download from Oracle`_. You -want to go with the packaged (non-tar) version. In case you have access to an -Oracle Solaris development tools support contract, please make sure to also -install `the latest Oracle Solaris Studio compiler patches`_. The compilers -should be installed at the following locations: - -* Sun Studio 11: ``/opt/studio/SOS11`` -* Sun Studio 12: ``/opt/studio/SOS12`` -* Sun Studio 12u1: ``/opt/studio/sunstudio12.1`` -* Solaris Studio 12u2: ``/opt/solstudio12.2`` -* Solaris Studio 12u3: ``/opt/solarisstudio12.3`` - -You can install multiple versions of SOS on one system. If you have your -compiler installed at a different location you can set it in your ``~/.garrc`` -with the following lines: - -:: - - SOS11_CC_HOME = /opt/SUNWspro - SOS12_CC_HOME = /opt/studio12/SUNWspro - - -Installing Oracle Solaris Studio 12 (optional) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -:: - - cd ss12 - ./batch_installer -d /opt/studio/SOS12 --accept-sla - -Installing Oracle Solaris Studio 12u3 (optional) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -:: - - sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp - -Patching the installed compilers -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Remember to patch the compilers, with PCA or manually (requires a software -service contract from Oracle). - Setup ``~/.garrc`` (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -439,6 +392,53 @@ TODO +Oracle Solaris Studio Compiler +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +You need a compiler. Most of the packages built by OpenCSW use Oracle Solaris +Studio (historically called 'SOS'), which you can `download from Oracle`_. You +want to go with the packaged (non-tar) version. In case you have access to an +Oracle Solaris development tools support contract, please make sure to also +install `the latest Oracle Solaris Studio compiler patches`_. The compilers +should be installed at the following locations: + +* Sun Studio 11: ``/opt/studio/SOS11`` +* Sun Studio 12: ``/opt/studio/SOS12`` +* Sun Studio 12u1: ``/opt/studio/sunstudio12.1`` +* Solaris Studio 12u2: ``/opt/solstudio12.2`` +* Solaris Studio 12u3: ``/opt/solarisstudio12.3`` + +You can install multiple versions of SOS on one system. If you have your +compiler installed at a different location you can set it in your ``~/.garrc`` +with the following lines: + +:: + + SOS11_CC_HOME = /opt/SUNWspro + SOS12_CC_HOME = /opt/studio12/SUNWspro + + +Installing Oracle Solaris Studio 12 ++++++++++++++++++++++++++++++++++++ + +:: + + cd ss12 + ./batch_installer -d /opt/studio/SOS12 --accept-sla + +Installing Oracle Solaris Studio 12u3 ++++++++++++++++++++++++++++++++++++++ + +:: + + sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp + +Patching the installed compilers +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Remember to patch the compilers, with PCA or manually (requires a software +service contract from Oracle). + Adding Users ^^^^^^^^^^^^ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Thu Oct 3 09:33:15 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Thu, 03 Oct 2013 09:33:15 +0200 Subject: [csw-devel] SF.net SVN: gar:[22104] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst In-Reply-To: (wahwah@users.sourceforge.net's message of "Wed, 02 Oct 2013 23:35:31 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > +Remember to patch the compilers, with PCA or manually (requires a software > +service contract from Oracle). This is an additional and quite strong reason to use GCC. How the heck can somebody build an "Open" stack if it depends on proprietary software for which the maintenance cost a lot of money? -- Peter From pfelecan at users.sourceforge.net Thu Oct 3 10:24:21 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 08:24:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[22105] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 22105 http://gar.svn.sourceforge.net/gar/?rev=22105&view=rev Author: pfelecan Date: 2013-10-03 08:24:21 +0000 (Thu, 03 Oct 2013) Log Message: ----------- opencsw-manual/trunk: clarified and completed Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-02 23:35:30 UTC (rev 22104) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-03 08:24:21 UTC (rev 22105) @@ -34,9 +34,10 @@ /opt/csw/bin/pkgutil -l For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of -``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On Solaris 10, -you can do that by editing the ``/etc/default/login`` file, and logging out -and back in. +``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On +Solaris 10, you can do that by editing the ``/etc/default/login`` +file, uncomment the ``PATH`` and ``SUPATH`` variables definition, and +logging out and back in. As the list is quite long and you probably have an idea what you are looking for the list can be fuzzy-matched with:: @@ -75,7 +76,7 @@ change it to ``unstable`` on your development hosts to catch any issues before they hit the ``testing`` catalog. -You can verify the setting with ``pkgutil -V``:: +You can verify the setting with ``pkgutil -V`` :: ... maxpkglist 10000 (default: 10000) @@ -101,7 +102,7 @@ Then you need to import the public key:: - root# /opt/csw/bin/cswpki --import + root# cswpki --import The current fingerprint looks like this:: @@ -113,7 +114,7 @@ You may also trust the key once you verified the fingerprint:: - root# /opt/csw/bin/gpg --homedir=/var/opt/csw/pki --edit-key board at opencsw.org trust + root# gpg --homedir=/var/opt/csw/pki --edit-key board at opencsw.org trust Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf`` and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this:: @@ -135,10 +136,29 @@ ... Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg. - gpg: Signature made Sat Jan 21 18:34:45 2012 CET using DSA key ID 9306CC77 + gpg: Signature made Thu Oct 03 00:32:57 2013 CEST using DSA key ID 9306CC77 gpg: Good signature from "OpenCSW catalog signing " gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C 9A3C 05F4 2D66 9306 CC77 - ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 + Looking for packages that can be upgraded ... + Solving needed dependencies ... + Solving dependency order ... + + Nothing to do. ... + +------------------------------- +Installing other basic packages +------------------------------- + +Installing the following packages is optional but recommended to have +a coherent stack: + +* gzip +* coreutils +* wget + +Finally, installing the ``gnulinks`` package and putting the +``/opt/csw/gnu`` value in the front of the list contained by the +``PATH`` variable, gives priority to basic utilities supplied by us. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Oct 3 10:44:00 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 08:44:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[22106] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 22106 http://gar.svn.sourceforge.net/gar/?rev=22106&view=rev Author: pfelecan Date: 2013-10-03 08:44:00 +0000 (Thu, 03 Oct 2013) Log Message: ----------- opencsw-manual/trunk: slight tweaks Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Property Changed: ---------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-03 08:24:21 UTC (rev 22105) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-03 08:44:00 UTC (rev 22106) @@ -1,3 +1,5 @@ +.. $Id$ + --------------- Getting started --------------- @@ -36,8 +38,8 @@ For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On Solaris 10, you can do that by editing the ``/etc/default/login`` -file, uncomment the ``PATH`` and ``SUPATH`` variables definition, and -logging out and back in. +file, uncomment the ``PATH`` and ``SUPATH`` variables definition, +adjust the values as required and log out and back in. As the list is quite long and you probably have an idea what you are looking for the list can be fuzzy-matched with:: Property changes on: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Oct 3 11:02:16 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 09:02:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[22107] csw/mgar/pkg/guile/trunk/Makefile Message-ID: Revision: 22107 http://gar.svn.sourceforge.net/gar/?rev=22107&view=rev Author: pfelecan Date: 2013-10-03 09:02:16 +0000 (Thu, 03 Oct 2013) Log Message: ----------- guile/trunk: refine packages content for SPARC variant Modified Paths: -------------- csw/mgar/pkg/guile/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/guile/trunk/Makefile Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2013-10-03 08:44:00 UTC (rev 22106) +++ csw/mgar/pkg/guile/trunk/Makefile 2013-10-03 09:02:16 UTC (rev 22107) @@ -1,3 +1,5 @@ +# $Id$ + NAME = guile VERSION = 2.0.9 GARTYPE = v2 @@ -53,6 +55,7 @@ PKGFILES_CSWlibguile2-0-22 += $(call baseisadirs,$(libdir),libguile-2\.0\.so\.22(\.\d+)*) PKGFILES_CSWlibguile2-0-22 += /opt/csw/lib/guile/.* PKGFILES_CSWlibguile2-0-22 += /opt/csw/lib/amd64/guile/.* +PKGFILES_CSWlibguile2-0-22 += /opt/csw/lib/sparcv9/guile/.* PKGFILES_CSWlibguile2-0-22 += /opt/csw/share/guile/.* # old libraries: SPKG_DESC_CSWlibguile2-0-22 += $(DESCRIPTION), libguile-2.0.so.22 @@ -99,13 +102,14 @@ RUNTIME_DEP_PKGS_CSWlibguile12 += CSWlibguile-ltdl1 CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/libguile.so.12.3.0 CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/sparcv9/libguile.so.12.3.0 -CHECKPKG_OVERRIDES_CSWlibguile12 += binary-disallowed-placement|file=opt/csw/lib/amd64/libguile.so.12.3.0|arch_id=3|arch_name=i386|bad_path=amd64 -CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/amd64/libguile.so.12.3.0 +CHECKPKG_OVERRIDES_CSWlibguile12 += binary-disallowed-placement|file=opt/csw/lib/amd64/libguile.so.12.3.0|arch_id=3|arch_name=i386|bad_path=amd64 +CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/amd64/libguile.so.12.3.0 +CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/sparcv9/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 -CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/amd64/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 +CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/amd64/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1 CHECKPKG_OVERRIDES_CSWlibguile12 += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libguile.so.12.3.0|arch_id=2|arch_name=sparcv8|bad_path=sparcv9 CHECKPKG_OVERRIDES_CSWlibguile-ltdl1 += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libguile-ltdl.so.1.0.0|arch_id=2|arch_name=sparcv8|bad_path=sparcv9 -CHECKPKG_OVERRIDES_CSWlibguile-ltdl1 += binary-disallowed-placement|file=opt/csw/lib/amd64/libguile-ltdl.so.1.0.0|arch_id=3|arch_name=i386|bad_path=amd64 +CHECKPKG_OVERRIDES_CSWlibguile-ltdl1 += binary-disallowed-placement|file=opt/csw/lib/amd64/libguile-ltdl.so.1.0.0|arch_id=3|arch_name=i386|bad_path=amd64 PACKAGES += CSWguile-dev CATALOGNAME_CSWguile-dev = guile_dev Property changes on: csw/mgar/pkg/guile/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 pfelecan at users.sourceforge.net Thu Oct 3 11:05:20 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 09:05:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[22108] csw/mgar/pkg/guile/branches/2.0.7/ Message-ID: Revision: 22108 http://gar.svn.sourceforge.net/gar/?rev=22108&view=rev Author: pfelecan Date: 2013-10-03 09:05:20 +0000 (Thu, 03 Oct 2013) Log Message: ----------- guile/branches: remove old branch 2.0.7 which not needed anymore Removed Paths: ------------- csw/mgar/pkg/guile/branches/2.0.7/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Oct 3 13:53:53 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 11:53:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22109] csw/mgar/pkg/opencsw-manual/trunk/files Message-ID: Revision: 22109 http://gar.svn.sourceforge.net/gar/?rev=22109&view=rev Author: pfelecan Date: 2013-10-03 11:53:52 +0000 (Thu, 03 Oct 2013) Log Message: ----------- opencsw-manual/trunk: corrections and clarifications Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Property Changed: ---------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-10-03 09:05:20 UTC (rev 22108) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst 2013-10-03 11:53:52 UTC (rev 22109) @@ -1,3 +1,5 @@ +.. $Id$ + --------------------------- Setting up a private mirror --------------------------- @@ -26,7 +28,8 @@ The directory ``opencsw-mirror`` can either be shared via HTTP or via NFS to the ``pkgutil`` clients. Use ``http://myserver/opencsw-mirror/`` for HTTP and -``file:///myserver/opencsw-mirror`` for NFS as mirror option in ``pkgutil``. +``file:///myserver/opencsw-mirror`` for NFS as mirror option in +``pkgutil``'s configuration file ``/etc/opt/csw/pkgutil.conf``. .. _our list of mirrors: http://www.opencsw.org/get-it/mirrors/ Property changes on: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/mirror-setup.rst ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 09:05:20 UTC (rev 22108) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 11:53:52 UTC (rev 22109) @@ -1,3 +1,5 @@ +.. $Id$ + --------------- Buildfarm setup --------------- @@ -42,7 +44,7 @@ :: - sudo pkgutil -y -i vim gar_dev mgar gcc4core gcc4g++ sudo + pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo Setup ``~/.garrc`` (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -86,9 +88,11 @@ Basic git configuration (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Git will be installed as one of dependencies. It is used by GAR to make source -patching easier. Provide basic configuration for git: +Git is installed as one of dependencies of the base setup. It is used +by GAR to make source patching easier. +The required configuration for our usage of git is: + :: git config --global user.email "you at example.com" @@ -101,28 +105,43 @@ :: sudo pkgutil -y -i vim - echo "export EDITOR=/opt/csw/bin/vim" >> ~/.bashrc + echo "export EDITOR=/opt/csw/bin/vim" >> ~/.bash_profile Of course, it can be your editor of choice. Initialize the source tree (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -As regular user (do not use ``root`` for safety reasons) to be used for -building init your local repository: +As regular user, initialize your local repository. **For obvious +security reasons, do not use** ``root``. +To initialize de source tree, you execute: + :: - mgar init [] (defaults to ~/opencsw) + mgar init +This will create, by default, in your home directory, the ``opencsw`` +entry. If you wish to use another place, please use a third argument, +e.g.: + +:: + + mgar init /tank/opencsw + +or set the ``BUILDTREE`` parameter in the configuration file +``~/.garrc`` + Please make yourself familiar with `mgar`_. -Fetch all the build recipes: +To fetch all the build recipes, you execute: :: mgar up --all +Beware that this takes a lot of time an create hundreds of directories. + checkpkg database (optional) ---------------------------- Property changes on: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Oct 3 14:33:44 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 12:33:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[22110] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22110 http://gar.svn.sourceforge.net/gar/?rev=22110&view=rev Author: pfelecan Date: 2013-10-03 12:33:44 +0000 (Thu, 03 Oct 2013) Log Message: ----------- opencsw-manual/trunk: spell-check the whole file Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 11:53:52 UTC (rev 22109) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 12:33:44 UTC (rev 22110) @@ -1,8 +1,8 @@ .. $Id$ ---------------- -Buildfarm setup ---------------- +---------------- +Build-farm setup +---------------- .. highlight:: text @@ -11,7 +11,7 @@ starting from a fresh Solaris 10 install and ends with a built package. It takes about 2-3h to complete. -A buildfarm is a set of hosts where you can build Solaris packages. You can +A build-farm is a set of hosts where you can build Solaris packages. You can connect Intel and SPARC hosts together to build a set of packages with one shell command. @@ -19,10 +19,10 @@ * mgar (builds packages) * checkpkg (checks packages for errors) -* web app (for browsing package metadata and manipulating catalogs) +* web app (for browsing package meta-data and manipulating catalogs) * catalog generation (to generate your own catalogs) * signing daemon (to automatically add GPG signatures to your catalogs) -* platforms (multi-architecture builds, e.g. intel+sparc) +* platforms (multi-architecture builds, e.g. Intel+SPARC) * additional software: Solaris Studio compiler, Java, etc. Prerequisites @@ -50,8 +50,8 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Finally, you need to create your personal ``~/.garrc`` configuration file. It -contains your name and e-mail adress, both of which are included in the -metadata of built packages. Further, GAR needs to know where to store +contains your name and e-mail address, both of which are included in the +meta-data of built packages. Further, GAR needs to know where to store downloaded sources and generated packages. Here's an example: @@ -69,7 +69,7 @@ GARCHIVEDIR = /home/dam/src # # Disable package sanity checks by checkpkg if you are building on your - # own host (checkpkg depends on OpenCSW buildfarm infrastructure) + # own host (checkpkg depends on OpenCSW build-farm infrastructure) ENABLE_CHECK = 0 In case you are sitting behind a proxy, you would also want to configure this in ~/.garrc. @@ -115,7 +115,7 @@ As regular user, initialize your local repository. **For obvious security reasons, do not use** ``root``. -To initialize de source tree, you execute: +To initialize the source tree, you execute: :: @@ -140,7 +140,8 @@ mgar up --all -Beware that this takes a lot of time an create hundreds of directories. +Beware that this takes a lot of time and creates hundreds of +directories and thousands files. checkpkg database (optional) ---------------------------- @@ -175,7 +176,7 @@ MySQL documentation in section `C.5.5.1. Case Sensitivity in String Searches`_ says: - For nonbinary strings (CHAR, VARCHAR, TEXT), string searches use the + For non-binary strings (CHAR, VARCHAR, TEXT), string searches use the collation of the comparison operands. For binary strings (BINARY, VARBINARY, BLOB), comparisons use the numeric values of the bytes in the operands; this means that for alphabetic characters, comparisons will be case sensitive. @@ -256,11 +257,11 @@ How to set up hosts allowing you to build for both Intel and SPARC architectures. At least three servers are needed: -* Solaris 9 Sparc to build 32 bit and 64 bit Sparc binaries +* Solaris 9 SPARC to build 32 bit and 64 bit SPARC binaries * Solaris 9 x86 to build 32 bit build x86 binaries * Solaris 10 x86 to build 64 bit x86 binaries -Servers with Solaris 10 Sparc are optional for most of the packages. However, +Servers with Solaris 10 SPARC are optional for most of the packages. However, there may be packages which rely on private kernel data (like "top") which needs to be build for each and every Solaris version to run on. @@ -274,9 +275,9 @@ via ``http://buildfarm.opencsw.org/experimental.html``. The ``experimental/`` directory is 01755 and users are free to create new projects as needed. -There is a `matrix of packages installed on the buildfarm`_. +There is a `matrix of packages installed on the build-farm`_. -.. _matrix of packages installed on the buildfarm: +.. _matrix of packages installed on the build-farm: http://buildfarm.opencsw.org/versionmatrix.html System-wide garrc (optional) @@ -326,8 +327,8 @@ Installing Software (optional) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -All software is archived and available from ``/home/farm`` on the buildfarm. -Make sure you deinstall ``SUNWgmake``. That version is outdated and misses +All software is archived and available from ``/home/farm`` on the build-farm. +Make sure you uninstall ``SUNWgmake``. That version is outdated and misses functions needed by GAR (e.g. abspath). Install Java Package @@ -362,8 +363,8 @@ ./batch_uninstall_all Please note: If you have also Sun Studio 12 installed the installer will -erranously remove some packages from Sun Studio 12 so you may need to -reinstall it after SOS 11 removal. +erroneously remove some packages from Sun Studio 12 so you may need to +re-install it after SOS 11 removal. Sun Studio 12 +++++++++++++ @@ -380,8 +381,8 @@ java -cp . uninstall_Sun_Studio_12 -nodisplay -noconsole Please note: If you have also Sun Studio 11 installed the installer will -erranously remove some packages from Sun Studio 11 so you may need to -reinstall it after SOS 12 removal. +erroneously remove some packages from Sun Studio 11 so you may need to +re-install it after SOS 12 removal. Sun Studio 12u1 +++++++++++++++ @@ -461,10 +462,10 @@ Adding Users ^^^^^^^^^^^^ -From here on in (Jan 2009), we are trying to keep userids in sync across all +From here on in (Jan 2009), we are trying to keep user ids in sync across all machines. ``www.opencsw.org`` is considered the master. If a user exists on www, then an account created from them on other machines, should be made to -match up userids. +match up user ids. There are some older, legacy, non-matched-up accounts. To make it easier to identify between newer and older accounts, cleanly created accounts are @@ -481,10 +482,10 @@ SSH Agent for each user ^^^^^^^^^^^^^^^^^^^^^^^ -It is advised to use a passphrase for the SSH key. This can easily be done by +It is advised to use a pass-phrase for the SSH key. This can easily be done by using the following steps: -Set passphrase on the key:: +Set pass-phrase on the key:: ssh-keygen -p -f .ssh/id_dsa @@ -509,11 +510,11 @@ (echo "Host current*"; echo "\tForwardAgent yes") >> ~/.ssh/config -There are similar methods with keychain available: +There are similar methods with key-chain available: -* `GPG, agent, pinentry and keychain`_ +* `GPG, agent, pin-entry and key-chain`_ -.. _GPG, agent, pinentry and keychain: +.. _GPG, agent, pin-entry and key-chain: http://lists.opencsw.org/pipermail/maintainers/2009-December/010732.html Installing DB2 client @@ -539,17 +540,17 @@ It seems the 32 bit and 64 bit clients can not be installed in the same directory. -Buildfarm web app (optional) ----------------------------- +Build-farm web app (optional) +----------------------------- pkgdb-web is a web app on which you can browse your package database and -inspect package metadata without having to unpack and examine packages in the +inspect package meta-data without having to unpack and examine packages in the terminal. Information such as list of files, pkginfo content and information about binaries are available on that page. The checkpkg database also holds information about catalogs. -* Live app on the OpenCSW buildfarm http://buildfarm.opencsw.org/pkgdb/ +* Live app on the OpenCSW build-farm http://buildfarm.opencsw.org/pkgdb/ * Source code: * Browse http://gar.svn.sourceforge.net/viewvc/gar/csw/mgar/gar/v2/lib/web @@ -562,7 +563,7 @@ Catalog generation (optional) ----------------------------- -Once you have the buildfarm database, you can generate your own package +Once you have the build-farm database, you can generate your own package catalogs. The main entry point which you can add to cron is the ``opencsw-future-update`` script. 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 Oct 3 14:41:48 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Oct 2013 12:41:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[22111] csw/mgar/pkg/lang-python/distribute/trunk Message-ID: Revision: 22111 http://gar.svn.sourceforge.net/gar/?rev=22111&view=rev Author: wahwah Date: 2013-10-03 12:41:48 +0000 (Thu, 03 Oct 2013) Log Message: ----------- lang-python/distribute/trunk: No, distribute_setup.py should not be part of this package. Each project using it should download and include a copy of it. Modified Paths: -------------- csw/mgar/pkg/lang-python/distribute/trunk/Makefile csw/mgar/pkg/lang-python/distribute/trunk/checksums Modified: csw/mgar/pkg/lang-python/distribute/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-03 12:33:44 UTC (rev 22110) +++ csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-03 12:41:48 UTC (rev 22111) @@ -7,17 +7,11 @@ CATEGORIES = python GARTYPE = v2 -DESCRIPTION = This package is a simple compatibility layer that installs Setuptools 0.7+ +DESCRIPTION = Simple compatibility layer that installs Setuptools 0.7+ -MASTER_SITES += http://python-distribute.org/ DISTFILES = $(DISTNAME).zip -DISTFILES += distribute_setup.py VENDOR_URL = https://pypi.python.org/pypi/distribute ARCHALL = 1 TEST_SCRIPTS = DEP_PKGS_CSWpy-distribute = CSWpy-setuptools include gar/category.mk - -post-install: - ginstall $(WORKDIR)/distribute_setup.py $(DESTDIR)$(PYTHON_SITE_PACKAGES) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/distribute/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/checksums 2013-10-03 12:33:44 UTC (rev 22110) +++ csw/mgar/pkg/lang-python/distribute/trunk/checksums 2013-10-03 12:41:48 UTC (rev 22111) @@ -1,2 +1 @@ c6c59594a7b180af57af8a0cc0cf5b4a distribute-0.7.3.zip -765e07c18a2c8af2f6d99a124e21824d distribute_setup.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Oct 3 14:50:51 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 3 Oct 2013 13:50:51 +0100 Subject: [csw-devel] SF.net SVN: gar:[22104] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst In-Reply-To: References: Message-ID: 2013/10/3 Peter FELECAN > > This is an additional and quite strong reason to use GCC. How the heck > can somebody build an "Open" stack if it depends on proprietary software > for which the maintenance cost a lot of money? +1 From pfelecan at users.sourceforge.net Thu Oct 3 15:06:50 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 03 Oct 2013 13:06:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[22112] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22112 http://gar.svn.sourceforge.net/gar/?rev=22112&view=rev Author: pfelecan Date: 2013-10-03 13:06:49 +0000 (Thu, 03 Oct 2013) Log Message: ----------- opencsw-manual/trunk: friends don't let friends use proprietary products. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 12:41:48 UTC (rev 22111) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-03 13:06:49 UTC (rev 22112) @@ -415,13 +415,21 @@ Oracle Solaris Studio Compiler ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -You need a compiler. Most of the packages built by OpenCSW use Oracle Solaris -Studio (historically called 'SOS'), which you can `download from Oracle`_. You -want to go with the packaged (non-tar) version. In case you have access to an +You need a compiler. You have one in our repository, the GNU one. + +Until recently, most of the packages built by OpenCSW used Oracle Solaris +Studio (historically called 'SOS'), which you can `download from +Oracle`_. + +Note that We are now, as of October 2013, transitioning to GCC. + +However, if you wish to use the platform specific compiler, you should +install the packaged (non-tar) version. In case you have access to an Oracle Solaris development tools support contract, please make sure to also -install `the latest Oracle Solaris Studio compiler patches`_. The compilers -should be installed at the following locations: +install `the latest Oracle Solaris Studio compiler patches`_. +The compilers should be installed at the following locations: + * Sun Studio 11: ``/opt/studio/SOS11`` * Sun Studio 12: ``/opt/studio/SOS12`` * Sun Studio 12u1: ``/opt/studio/sunstudio12.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 Thu Oct 3 19:51:35 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 03 Oct 2013 17:51:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[22113] csw/mgar/pkg/lang-python/distribute/trunk/Makefile Message-ID: Revision: 22113 http://gar.svn.sourceforge.net/gar/?rev=22113&view=rev Author: wahwah Date: 2013-10-03 17:51:34 +0000 (Thu, 03 Oct 2013) Log Message: ----------- lang-python/distribute/trunk: This package really doesn't ship any .py files. Modified Paths: -------------- csw/mgar/pkg/lang-python/distribute/trunk/Makefile Modified: csw/mgar/pkg/lang-python/distribute/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-03 13:06:49 UTC (rev 22112) +++ csw/mgar/pkg/lang-python/distribute/trunk/Makefile 2013-10-03 17:51:34 UTC (rev 22113) @@ -14,4 +14,6 @@ ARCHALL = 1 TEST_SCRIPTS = DEP_PKGS_CSWpy-distribute = CSWpy-setuptools +CHECKPKG_OVERRIDES_CSWpy-distribute += python-package-missing-py-files +CHECKPKG_OVERRIDES_CSWpy-distribute += surplus-dependency|CSWpy-setuptools include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Oct 3 21:58:25 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 03 Oct 2013 19:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[22114] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 22114 http://gar.svn.sourceforge.net/gar/?rev=22114&view=rev Author: chninkel Date: 2013-10-03 19:58:23 +0000 (Thu, 03 Oct 2013) Log Message: ----------- openssl1/trunk: disable sse2 for i386 build (temporary workaround) Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-03 17:51:34 UTC (rev 22113) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-03 19:58:23 UTC (rev 22114) @@ -173,7 +173,7 @@ # The corresponding os/compiler to pass to the # openssl Configure script -i386_OS_COMPILER = solaris-x86-cc-sunw +i386_OS_COMPILER = no-sse2 solaris-x86-cc-sunw pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw amd64_OS_COMPILER = solaris64-x86_64-cc-sunw Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-03 17:51:34 UTC (rev 22113) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-03 19:58:23 UTC (rev 22114) @@ -1,3 +1,9 @@ +openssl (1.0.1e,rev=2013.08.10) unstable + + * Disabled sse2 support for the i386 architecture. + + -- yann rouillard Thu, 03 Oct 2013 21:57:06 +0200 + openssl (1.0.1e,rev=2013.08.07) unstable * Disabled pkcs11 engine patch under sparc for now as it This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Oct 4 10:15:39 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 04 Oct 2013 08:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[22115] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22115 http://gar.svn.sourceforge.net/gar/?rev=22115&view=rev Author: pfelecan Date: 2013-10-04 08:15:39 +0000 (Fri, 04 Oct 2013) Log Message: ----------- openssl1/trunk: also disable sse2 for pentium_pro build (temporary workaround) Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-03 19:58:23 UTC (rev 22114) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-04 08:15:39 UTC (rev 22115) @@ -174,7 +174,7 @@ # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = no-sse2 solaris-x86-cc-sunw -pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw +pentium_pro_OS_COMPILER = no-sse2 solaris-x86-pentium_pro-cc-sunw amd64_OS_COMPILER = solaris64-x86_64-cc-sunw sparcv8_OS_COMPILER = solaris-sparcv8-cc-sunw @@ -240,7 +240,7 @@ fi [ ! -d "$(PKGROOT)$(sysconfdir)/ssl/misc" ] || \ mv "$(PKGROOT)$(sysconfdir)/ssl/misc" "$(PKGROOT)/$(prefix)/ssl/" - + merge-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Oct 4 17:54:28 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 04 Oct 2013 15:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22116] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22116 http://gar.svn.sourceforge.net/gar/?rev=22116&view=rev Author: pfelecan Date: 2013-10-04 15:54:28 +0000 (Fri, 04 Oct 2013) Log Message: ----------- opencsw-manual/trunk: - add sudo where needed - started to verify the checkpkg optional chapter Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 08:15:39 UTC (rev 22115) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 15:54:28 UTC (rev 22116) @@ -35,7 +35,12 @@ all packages that are in any of OpenCSW catalogs for any Solaris version. A typical location is ``/export/mirror/opencsw``. +* `Regular user setup`_ for details on setting up an user: creation, + sudo activation, etc. +.. _Regular user setup: + http://usable-solaris.googlecode.com/svn/trunk/docs/solaris-10-preliminary-setup.html#_regular_user_setup + Base setup (required) --------------------- @@ -44,7 +49,7 @@ :: - pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo + sudo pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo Setup ``~/.garrc`` (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -151,22 +156,93 @@ You can use any database engine supported by sqlobject. MySQL and sqlite have been tested. -When using MySQL, you need to create the database and a user which has access -to that database (not covered here). +Required packages +^^^^^^^^^^^^^^^^^ -max_allowed_packet problem in MySQL -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Install the required packages: -Since checkpkg stores objects in JSON, it sometimes stores values way bigger -than the default allowed 1MB. For this to work with MySQL, the following -needs to be present in ``/etc/opt/csw/my.cnf``:: +:: - [mysqld] - max_allowed_packet=64M + sudo pkgutil --yes --install cswutils mysql5 mysql5client -There are packages which require data structures larger than 32MB, hence the + +Create a minimal configuration file: + +:: + + sudo echo >>/etc/opt/csw/my.cnf "[mysqld]" + sudo echo >>/etc/opt/csw/my.cnf "max_allowed_packet=64M" + +This is needed since checkpkg stores objects in JSON, it sometimes +stores values way bigger than the default allowed 1MB, as there are +packages which require data structures larger than 32MB, hence the 64MB value. +You start the data base server: + +:: + + sudo svcadm enable svc:/network/cswmysql5:default + +Eventually, you make your installation secure: + +:: + + sudo /opt/csw/bin/mysql_secure_installation + +and answer affirmatively to all the questions. + +Creating the database +^^^^^^^^^^^^^^^^^^^^^ + +When using MySQL, you need to create the database and a user which has access +to that database. + +:: + + mysql -u root -h 127.0.0.1 -p + > create database checkpkg; + > grant all privileges on checkpkg.* to "checkpkg" identified by "password"; + > flush privileges; + > exit; + +Note that you must use your own value instead of ``password``. + +To verify that your user creation is correct you can execute this: + +:: + + mysql -u wp1 -h 127.0.0.1 -p + > use checkpkg; + > status; + > exit; + +Configuration +^^^^^^^^^^^^^ + +The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. +You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is +as follows: + +:: + + [database] + type = mysql + name = checkpkg + host = mysql + user = checkpkg + password = yourpassword + + +Initializing tables and indexes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The next step is creating the tables in the database: + +:: + + pkgdb initdb + case-insensitive string comparison in MySQL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -194,29 +270,6 @@ Before applying these changes, make sure that you're using the same column settings as the ones in the database. -Configuration -^^^^^^^^^^^^^ - -The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. -You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is -as follows:: - - [database] - - type = mysql - name = checkpkg - host = mysql - user = checkpkg - password = yourpassword - - -Initializing tables and indexes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The next step is creating the tables in the database:: - - bin/pkgdb initdb - System files indexing ^^^^^^^^^^^^^^^^^^^^^ @@ -415,13 +468,14 @@ Oracle Solaris Studio Compiler ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -You need a compiler. You have one in our repository, the GNU one. +You need a compiler. You have one in our repository, the GNU compiler +suite. Until recently, most of the packages built by OpenCSW used Oracle Solaris Studio (historically called 'SOS'), which you can `download from Oracle`_. -Note that We are now, as of October 2013, transitioning to GCC. +Note that we are now, as of October 2013, transitioning to GCC. However, if you wish to use the platform specific compiler, you should install the packaged (non-tar) version. In case you have access to an This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Fri Oct 4 19:08:02 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Fri, 4 Oct 2013 18:08:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[22116] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst In-Reply-To: References: Message-ID: 2013/10/4 : > Revision: 22116 > http://gar.svn.sourceforge.net/gar/?rev=22116&view=rev > Author: pfelecan > Date: 2013-10-04 15:54:28 +0000 (Fri, 04 Oct 2013) > Log Message: > ----------- > opencsw-manual/trunk: > - add sudo where needed > - started to verify the checkpkg optional chapter > > Modified Paths: > -------------- > csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst > > Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst > =================================================================== > --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 08:15:39 UTC (rev 22115) > +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 15:54:28 UTC (rev 22116) > @@ -35,7 +35,12 @@ > all packages that are in any of OpenCSW catalogs for any Solaris version. > A typical location is ``/export/mirror/opencsw``. > > +* `Regular user setup`_ for details on setting up an user: creation, > + sudo activation, etc. > > +.. _Regular user setup: > + http://usable-solaris.googlecode.com/svn/trunk/docs/solaris-10-preliminary-setup.html#_regular_user_setup > + > Base setup (required) > --------------------- > > @@ -44,7 +49,7 @@ > > :: > > - pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo > + sudo pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo Hah, this can't work: you can't install sudo if it's not installed yet! > > Setup ``~/.garrc`` (required) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > @@ -151,22 +156,93 @@ > You can use any database engine supported by sqlobject. MySQL and sqlite have > been tested. > > -When using MySQL, you need to create the database and a user which has access > -to that database (not covered here). > +Required packages > +^^^^^^^^^^^^^^^^^ > > -max_allowed_packet problem in MySQL > -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > +Install the required packages: > > -Since checkpkg stores objects in JSON, it sometimes stores values way bigger > -than the default allowed 1MB. For this to work with MySQL, the following > -needs to be present in ``/etc/opt/csw/my.cnf``:: > +:: > > - [mysqld] > - max_allowed_packet=64M > + sudo pkgutil --yes --install cswutils mysql5 mysql5client > > -There are packages which require data structures larger than 32MB, hence the > + > +Create a minimal configuration file: > + > +:: > + > + sudo echo >>/etc/opt/csw/my.cnf "[mysqld]" > + sudo echo >>/etc/opt/csw/my.cnf "max_allowed_packet=64M" > + > +This is needed since checkpkg stores objects in JSON, it sometimes > +stores values way bigger than the default allowed 1MB, as there are > +packages which require data structures larger than 32MB, hence the > 64MB value. > > +You start the data base server: > + > +:: > + > + sudo svcadm enable svc:/network/cswmysql5:default > + > +Eventually, you make your installation secure: > + > +:: > + > + sudo /opt/csw/bin/mysql_secure_installation This needs to be executed first, and only then "svcadm enable". > + > +and answer affirmatively to all the questions. > + > +Creating the database > +^^^^^^^^^^^^^^^^^^^^^ > + > +When using MySQL, you need to create the database and a user which has access > +to that database. > + > +:: > + > + mysql -u root -h 127.0.0.1 -p The "-h 127.0.0.1" option is not necessary. If the database is local, it'll connect via a socket. > + > create database checkpkg; > + > grant all privileges on checkpkg.* to "checkpkg" identified by "password"; > + > flush privileges; > + > exit; > + > +Note that you must use your own value instead of ``password``. > + > +To verify that your user creation is correct you can execute this: > + > +:: > + > + mysql -u wp1 -h 127.0.0.1 -p > + > use checkpkg; > + > status; > + > exit; > + > +Configuration > +^^^^^^^^^^^^^ > + > +The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. > +You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is > +as follows: > + > +:: > + > + [database] > + type = mysql > + name = checkpkg > + host = mysql > + user = checkpkg > + password = yourpassword > + > + > +Initializing tables and indexes > +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > + > +The next step is creating the tables in the database: > + > +:: > + > + pkgdb initdb "bin/pkgdb initdb", not "pkgdb initdb". You're executing it from GAR sources, with PWD being the "v2 directory. Maybe this could be made clearer somehow in the instructions? From pfelecan at opencsw.org Fri Oct 4 20:14:21 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Fri, 04 Oct 2013 20:14:21 +0200 Subject: [csw-devel] SF.net SVN: gar:[22116] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Fri, 4 Oct 2013 18:08:02 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2013/10/4 : >> Revision: 22116 >> http://gar.svn.sourceforge.net/gar/?rev=22116&view=rev >> Author: pfelecan >> Date: 2013-10-04 15:54:28 +0000 (Fri, 04 Oct 2013) >> Log Message: >> ----------- >> opencsw-manual/trunk: >> - add sudo where needed >> - started to verify the checkpkg optional chapter >> >> Modified Paths: >> -------------- >> csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst >> >> Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst >> =================================================================== >> --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 08:15:39 UTC (rev 22115) >> +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 15:54:28 UTC (rev 22116) >> @@ -35,7 +35,12 @@ >> all packages that are in any of OpenCSW catalogs for any Solaris version. >> A typical location is ``/export/mirror/opencsw``. >> >> +* `Regular user setup`_ for details on setting up an user: creation, >> + sudo activation, etc. >> >> +.. _Regular user setup: >> + http://usable-solaris.googlecode.com/svn/trunk/docs/solaris-10-preliminary-setup.html#_regular_user_setup >> + >> Base setup (required) >> --------------------- >> >> @@ -44,7 +49,7 @@ >> >> :: >> >> - pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo >> + sudo pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo > > Hah, this can't work: you can't install sudo if it's not installed yet! I agree with you. However it was what you have written and I just put it back without verifying. That was the reason for which I took it out in the first place. Will be corrected. >> >> Setup ``~/.garrc`` (required) >> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> @@ -151,22 +156,93 @@ >> You can use any database engine supported by sqlobject. MySQL and sqlite have >> been tested. >> >> -When using MySQL, you need to create the database and a user which has access >> -to that database (not covered here). >> +Required packages >> +^^^^^^^^^^^^^^^^^ >> >> -max_allowed_packet problem in MySQL >> -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> +Install the required packages: >> >> -Since checkpkg stores objects in JSON, it sometimes stores values way bigger >> -than the default allowed 1MB. For this to work with MySQL, the following >> -needs to be present in ``/etc/opt/csw/my.cnf``:: >> +:: >> >> - [mysqld] >> - max_allowed_packet=64M >> + sudo pkgutil --yes --install cswutils mysql5 mysql5client >> >> -There are packages which require data structures larger than 32MB, hence the >> + >> +Create a minimal configuration file: >> + >> +:: >> + >> + sudo echo >>/etc/opt/csw/my.cnf "[mysqld]" >> + sudo echo >>/etc/opt/csw/my.cnf "max_allowed_packet=64M" >> + >> +This is needed since checkpkg stores objects in JSON, it sometimes >> +stores values way bigger than the default allowed 1MB, as there are >> +packages which require data structures larger than 32MB, hence the >> 64MB value. >> >> +You start the data base server: >> + >> +:: >> + >> + sudo svcadm enable svc:/network/cswmysql5:default >> + >> +Eventually, you make your installation secure: >> + >> +:: >> + >> + sudo /opt/csw/bin/mysql_secure_installation > > This needs to be executed first, and only then "svcadm enable". The script needs a running server. Install on a pristine system and try to run the script and you'll see for yourself. Because, when you run the script the service disabled: # svcs -l svc:/network/cswmysql5:default fmri svc:/network/cswmysql5:default enabled false state disabled next_state none state_time Fri Oct 04 20:12:55 2013 logfile /var/svc/log/network-cswmysql5:default.log restarter svc:/system/svc/restarter:default contract_id dependency require_all/none svc:/system/filesystem/local (online) dependency require_all/none svc:/network/loopback (online) you get: # /opt/csw/bin/mysql_secure_installation NOTE: RUNNING ALL PARTS OF THIS SCRIPT IS RECOMMENDED FOR ALL MySQL SERVERS IN PRODUCTION USE! PLEASE READ EACH STEP CAREFULLY! In order to log into MySQL to secure it, we'll need the current password for the root user. If you've just installed MySQL, and you haven't set the root password yet, the password will be blank, so you should just press enter here. Enter current password for root (enter for none): ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2) Enter current password for root (enter for none): ad infinitum >> + >> +and answer affirmatively to all the questions. >> + >> +Creating the database >> +^^^^^^^^^^^^^^^^^^^^^ >> + >> +When using MySQL, you need to create the database and a user which has access >> +to that database. >> + >> +:: >> + >> + mysql -u root -h 127.0.0.1 -p > > The "-h 127.0.0.1" option is not necessary. If the database is local, > it'll connect via a socket. You're right. > >> + > create database checkpkg; >> + > grant all privileges on checkpkg.* to "checkpkg" identified by "password"; >> + > flush privileges; >> + > exit; >> + >> +Note that you must use your own value instead of ``password``. >> + >> +To verify that your user creation is correct you can execute this: >> + >> +:: >> + >> + mysql -u wp1 -h 127.0.0.1 -p >> + > use checkpkg; >> + > status; >> + > exit; >> + >> +Configuration >> +^^^^^^^^^^^^^ >> + >> +The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. >> +You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is >> +as follows: >> + >> +:: >> + >> + [database] >> + type = mysql >> + name = checkpkg >> + host = mysql >> + user = checkpkg >> + password = yourpassword >> + >> + >> +Initializing tables and indexes >> +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> + >> +The next step is creating the tables in the database: >> + >> +:: >> + >> + pkgdb initdb > > "bin/pkgdb initdb", not "pkgdb initdb". You're executing it from GAR > sources, with PWD being the "v2 directory. Maybe this could be made > clearer somehow in the instructions? Clearer you said? -- Peter From dmichelsen at users.sourceforge.net Fri Oct 4 21:16:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 04 Oct 2013 19:16:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[22117] csw/mgar/pkg/libneon27/trunk Message-ID: Revision: 22117 http://gar.svn.sourceforge.net/gar/?rev=22117&view=rev Author: dmichelsen Date: 2013-10-04 19:16:52 +0000 (Fri, 04 Oct 2013) Log Message: ----------- libneon27/trunk: Update to 0.30.0 Modified Paths: -------------- csw/mgar/pkg/libneon27/trunk/Makefile csw/mgar/pkg/libneon27/trunk/checksums Modified: csw/mgar/pkg/libneon27/trunk/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2013-10-04 15:54:28 UTC (rev 22116) +++ csw/mgar/pkg/libneon27/trunk/Makefile 2013-10-04 19:16:52 UTC (rev 22117) @@ -1,5 +1,6 @@ NAME = neon -VERSION = 0.29.6 +VERSION = 0.30.0 +SONAME_MINOR = 3.0 GARTYPE = v2 EXTRA_MODULATORS = FEATURES @@ -17,13 +18,13 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += COPYING -FOREIGN_PACKAGES += CSWlibneon26 -OBSOLETED_BY_CSWlibneon26 = CSWneon +#FOREIGN_PACKAGES += CSWlibneon26 +#OBSOLETED_BY_CSWlibneon26 = CSWneon -FOREIGN_PACKAGES += CSWlibneon26-feature -OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull +#FOREIGN_PACKAGES += CSWlibneon26-feature +#OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull -CATALOGNAME_CSWneonfull = neon_full_stub +#CATALOGNAME_CSWneonfull = neon_full_stub PACKAGES += CSWlibneon27 CATALOGNAME_CSWlibneon27 = libneon27 @@ -46,11 +47,8 @@ RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibpakchois0 OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull @@ -61,17 +59,14 @@ RUNTIME_DEP_PKGS_CSWlibneon-dev += CSWlibneon27 OBSOLETED_BY_CSWlibneon-dev = CSWneon-devel -# This describes the defaults during configure -CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html - # These are artifacts of the feature lib being a regular one. # As it is never linked against the soname doesn't matter here and the package name # is obviously different from the soname in this case. -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.$(SONAME_MINOR) +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.$(SONAME_MINOR) CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch -BUILD_DEP_PKGS = CSWossldevel +BUILD_DEP_PKGS += CSWlibssl-dev CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois @@ -121,10 +116,10 @@ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) @$(MAKECOOKIE) -post-merge: +post-merge-all: @# This is needed because the substitutions from pax args do not change the @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/libneon-feature.so.27 + ln -s libneon-feature.so.27.$(SONAME_MINOR) $(PKGROOT)$(libdir)/libneon-feature.so.27 rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + ln -s libneon-feature.so.27.$(SONAME_MINOR) $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 Modified: csw/mgar/pkg/libneon27/trunk/checksums =================================================================== --- csw/mgar/pkg/libneon27/trunk/checksums 2013-10-04 15:54:28 UTC (rev 22116) +++ csw/mgar/pkg/libneon27/trunk/checksums 2013-10-04 19:16:52 UTC (rev 22117) @@ -1,2 +1,2 @@ 608826974d5644ee7967a713fa72cf36 COPYING -591e0c82e6979e7e615211b386b8f6bc neon-0.29.6.tar.gz +fb60b3a124eeec441937a812c456fd94 neon-0.30.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Oct 5 00:07:18 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 04 Oct 2013 22:07:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[22118] csw/mgar/pkg/lang-python/mysql-python/trunk Message-ID: Revision: 22118 http://gar.svn.sourceforge.net/gar/?rev=22118&view=rev Author: wahwah Date: 2013-10-04 22:07:18 +0000 (Fri, 04 Oct 2013) Log Message: ----------- lang-python/mysql-python/trunk: Upgrade to a new version Modified Paths: -------------- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile csw/mgar/pkg/lang-python/mysql-python/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2013-10-04 19:16:52 UTC (rev 22117) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2013-10-04 22:07:18 UTC (rev 22118) @@ -1,7 +1,7 @@ # $Id$ NAME = MySQL-python -VERSION = 1.2.4 +VERSION = 1.2.4b4 CATEGORIES = python GARTYPE = v2 @@ -10,16 +10,25 @@ endef SF_PROJECT = $(call TOLOWER,$(NAME)) -# MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).zip -GARCOMPILER = SOS12U3 +PATCHFILES += 0001-Disable-the-stupid-download.-We-have-setuptools.patch +PATCHFILES += 0002-Remove-GCC-incompatible-compilation-flags.patch +# PATCHFILES_2_7 += 0002-Remove-GCC-incompatible-compilation-flags.patch +# PATCHFILES += $(PATCHFILES_$(PYTHON_VERSION)) +BUILD_DEP_PKGS = CSWpy-setuptools PACKAGES = CSWpy-mysql +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-7-1-0 SPKG_DESC_CSWpy-mysql = MySQL Support for Python +OBSOLETED_BY_CSWpy-mysql = CSWpymysql + SKIPTEST = 1 +CHECKPKG_OVERRIDES_CSWpy-mysql += binary-architecture-does-not-match-placement|file=opt/csw/lib/python2.6/site-packages/_mysql.so|arch_id=18|arch_name=sparcv8+ + include gar/category.mk Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2013-10-04 19:16:52 UTC (rev 22117) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2013-10-04 22:07:18 UTC (rev 22118) @@ -1 +1 @@ -ddf2386daf10a97af115ffad2ed4a9a0 MySQL-python-1.2.4.zip +2ce6fad5c5fe4074c33e8e799dc7a0af MySQL-python-1.2.4b4.zip Added: csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch (rev 0) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/files/0001-Disable-the-stupid-download.-We-have-setuptools.patch 2013-10-04 22:07:18 UTC (rev 22118) @@ -0,0 +1,27 @@ +From 824f4fced9ca81059100cabb012548a7070b93fd Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Oct 2013 19:47:27 +0200 +Subject: [PATCH] Disable the stupid download. We have setuptools! + +--- + setup.py | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/setup.py b/setup.py +index 798f96f..684023c 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,8 +3,8 @@ + import os + import sys + +-from distribute_setup import use_setuptools +-use_setuptools() ++# from distribute_setup import use_setuptools ++# use_setuptools() + from setuptools import setup, Extension + + if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000: +-- +1.7.10.3 + Added: csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch (rev 0) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/files/0002-Remove-GCC-incompatible-compilation-flags.patch 2013-10-04 22:07:18 UTC (rev 22118) @@ -0,0 +1,25 @@ +From 1b0107dad51359fac86ab204c2331894b67be54c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 4 Oct 2013 23:49:15 +0200 +Subject: [PATCH] Remove GCC-incompatible compilation flags. + +--- + setup_posix.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup_posix.py b/setup_posix.py +index f7cb588..86e9a1b 100644 +--- a/setup_posix.py ++++ b/setup_posix.py +@@ -52,7 +52,7 @@ def get_config(): + library_dirs = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("L")) ] + libraries = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("l")) ] + +- removable_compile_args = [ compiler_flag(f) for f in "ILl" ] ++ removable_compile_args = [ compiler_flag(f) for f in "ILlKmxfn" ] + extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags") + if i[:2] not in removable_compile_args ] + +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 5 15:18:58 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 05 Oct 2013 13:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[22119] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22119 http://gar.svn.sourceforge.net/gar/?rev=22119&view=rev Author: pfelecan Date: 2013-10-05 13:18:56 +0000 (Sat, 05 Oct 2013) Log Message: ----------- opencsw-manual/trunk: - clarified sudo installation - removed redundancy from MySQL setup Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-04 22:07:18 UTC (rev 22118) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-05 13:18:56 UTC (rev 22119) @@ -49,8 +49,10 @@ :: - sudo pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo + pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo +Please note that this must be run as ``root``. + Setup ``~/.garrc`` (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -163,7 +165,7 @@ :: - sudo pkgutil --yes --install cswutils mysql5 mysql5client + sudo pkgutil --yes --install mysql5 mysql5client Create a minimal configuration file: @@ -200,7 +202,7 @@ :: - mysql -u root -h 127.0.0.1 -p + mysql -u root -p > create database checkpkg; > grant all privileges on checkpkg.* to "checkpkg" identified by "password"; > flush privileges; @@ -212,7 +214,7 @@ :: - mysql -u wp1 -h 127.0.0.1 -p + mysql -u checkpkg -p > use checkpkg; > status; > exit; 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 Oct 5 18:41:27 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 05 Oct 2013 16:41:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[22120] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 22120 http://gar.svn.sourceforge.net/gar/?rev=22120&view=rev Author: guengel Date: 2013-10-05 16:41:25 +0000 (Sat, 05 Oct 2013) Log Message: ----------- postgresql/trunk: Recipe ready for 9.3. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch Removed Paths: ------------- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-05 13:18:56 UTC (rev 22119) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-05 16:41:25 UTC (rev 22120) @@ -133,8 +133,10 @@ # 8.4 has removed ipcclean BIN_NAMES_SERVER = postmaster initdb pg_controldata pg_ctl pg_resetxlog pg_receivexlog pg_basebackup postgres BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = psql clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore reindexdb vacuumdb clusterdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing +# 9.3 has introduced pg_isready +BIN_NAMES_CLIENT = psql clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore reindexdb vacuumdb clusterdb pg_isready +# 9.3 introduced pg_xlogdump +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing pg_xlogdump # 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 @@ -159,7 +161,7 @@ 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 dummy_seclabel.so -SO_NAMES_CONTRIB += auth_delay.so file_fdw.so tcn.so +SO_NAMES_CONTRIB += auth_delay.so file_fdw.so tcn.so postgres_fdw.so worker_spi.so # Those are the extension provided by contrib. # # This has been introduced with 9.1 @@ -170,7 +172,7 @@ 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 += 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 @@ -184,14 +186,14 @@ 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 += 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 += pgrowlocks.control pgrowlocks--unpackaged--1.0.sql EXT_NAMES_CONTRIB += pg_stat_statements--1.1.sql pg_stat_statements--1.0--1.1.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 += pgstattuple.control pgstattuple--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += 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 @@ -200,8 +202,10 @@ 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 -EXT_NAMES_CONTRIB += tcn.control tcn--1.0.sql +EXT_NAMES_CONTRIB += xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql postgres_fdw--1.0.sql postgres_fdw.control +EXT_NAMES_CONTRIB += tcn.control tcn--1.0.sql dblink--1.0--1.1.sql dblink--1.1.sql +EXT_NAMES_CONTRIB += pageinspect--1.0--1.1.sql pageinspect--1.1.sql pg_trgm--1.0--1.1.sql pg_trgm--1.1.sql +EXT_NAMES_CONTRIB += pgrowlocks--1.0--1.1.sql pgrowlocks--1.1.sql pgstattuple--1.0--1.1.sql pgstattuple--1.1.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 @@ -274,16 +278,36 @@ # 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/pgsql92/tmp_check -PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch +PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)' # which isn't properly digested by Sun's ld -PATCHFILES += 0002-Use-plain-rpath.patch +PATCHFILES += 0000-Use-plain-rpath.patch # Please see comment in the patch. -PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch +PATCHFILES += 0000-Filter-out-compiler-optimization-for-pg_config.patch +# We used to use a patch for the REINPLACE stuff below, but switched +# to REINPLACE due to easier maintenance. +# +# Please make sure that +# +# /var/tmp/pgsql/$(BASE_VERSION_NODOT) +# +# has been created prior calling `gmake check'. (Can be done in the +# custom check target below; see TEST_SCRIPTS) +# +# Rationale: +# ---------- +# +# We need to use a local storage for the tests, since tests may fail +# when run in a NFS directory. +REINPLACE_MATCH = \./tmp_check +REINPLACE_WITH = /var/tmp/pgsql/$(BASE_VERSION_NODOT)/tmp_check +# The list of files can be composed using +# find work/build-isa-amd64/postgresql-X.Y.Z/ -name Makefile\* | xargs grep -l './tmp_check' +REINPLACE_FILES = src/Makefile.global.in +REINPLACE_FILES += src/interfaces/ecpg/test/Makefile +REINPLACE_FILES += src/test/isolation/Makefile + INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) @@ -480,8 +504,16 @@ # If the check is not called from within the $(WORKSRC) dir, it # fails. This behavior appeared with version 9.1. +# +# Also, we require /var/tmp/pgsql/$(BASE_VERSION_NODOT)/ +# to be created prior calling `gmake check' since +# the checks only create the bottom level directory +# and not any intermediate directories. test-custom: + rm -rf /var/tmp/pgsql/$(BASE_VERSION_NODOT)/ + install -d /var/tmp/pgsql/$(BASE_VERSION_NODOT)/ cd $(WORKSRC) ; $(BUILD_ENV) gmake check + rm -rf /var/tmp/pgsql/$(BASE_VERSION_NODOT)/ @$(MAKECOOKIE) # This will generate the ALTERNATIVEs for the binaries in @@ -531,9 +563,6 @@ echo "$(WORKSRC)/src/Makefile.global.in not found. Aborting" ; \ exit 1 ; \ fi - @echo " ===> Setting temp-install dir in $(WORKSRC)/src/Makefile.global.in" - gsed -i -r -e 's|\./tmp_check|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' -e 's|tmp_check/|/var/tmp/pgsql$(BASE_VERSION_NODOT)/tmp_check|g' \ - $(WORKSRC)/src/Makefile.global.in @$(MAKECOOKIE) post-build-modulated: @@ -571,8 +600,8 @@ # Adjust the man page names. @echo " ===> Adjusting man page file names" @for i in 1 5 ; do \ - test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \ - for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \ + test -d $(PKGROOT)$(mandir)/man$$i || continue ; \ + for f in $(PKGROOT)$(mandir)/man$$i/* ; do \ suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \ f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \ bname="`basename $${f_no_suffix}`" ; \ @@ -583,6 +612,13 @@ fi ; \ done ;\ done +# Revert changes on man page name for devel binaries + @for f in $(BIN_NAMES_DEVEL) ; do \ + for i in 1 5 ; do \ + test -f $(PKGROOT)$(mandir)/man$$i/$$f-$(BASE_VERSION_NODOT).$$i || continue ; \ + mv $(PKGROOT)$(mandir)/man$$i/$$f-$(BASE_VERSION_NODOT).$$i $(PKGROOT)$(mandir)/man$$i/$$f.$$i ; \ + done ; \ + done # Change path names in documentation @echo " ===> Adjust 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 \ Added: csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Filter-out-compiler-optimization-for-pg_config.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -0,0 +1,49 @@ +From a9443d614442bc01be357b83ddea2893007a0001 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 5 Oct 2013 16:52:55 +0200 +Subject: [PATCH] Filter out compiler optimization for pg_config + +For more information, see comments in this patch and +https://www.opencsw.org/mantis/view.php?id=5025 +--- + src/bin/pg_config/Makefile | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile +index 8df4a94..1bc1560 100644 +--- a/src/bin/pg_config/Makefile ++++ b/src/bin/pg_config/Makefile +@@ -8,6 +8,18 @@ + # + #------------------------------------------------------------------------- + ++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization. ++# This doesn't pan out if PostgreSQL is compiled with compiler A, but ++# pg_config is called to compile software with compiler B. So, we filter out ++# known compiler optimization flags (SunStudio and GCC, so far). ++# ++# This var holds all the compiler optimizations that will be filtered out. ++# Please be aware, that this filtering has only been tested with GMAKE. ++# ++# See also ++# https://www.opencsw.org/mantis/view.php?id=5025 ++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO% ++ + PGFILEDESC = "pg_config - report configuration information" + PGAPPICON=win32 + +@@ -24,9 +36,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS)) + override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" + override CPPFLAGS += -DVAL_CC="\"$(CC)\"" + override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" +-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" ++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\"" + override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" +-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" ++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\"" + override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" + override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\"" + override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\"" +-- +1.8.3.4 + Deleted: csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch 2013-10-05 13:18:56 UTC (rev 22119) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql92-tmp_check.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -1,44 +0,0 @@ -From e02c1f65cb7bb300e5ce926b6d96d391f51c8c3b Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 16 Sep 2012 10:56:57 +0200 -Subject: [PATCH 0/2] Run tests in /var/tmp/pgsql92/tmp_check - ---- - src/test/regress/GNUmakefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile -index 0239b6f..376631c 100644 ---- a/src/test/regress/GNUmakefile -+++ b/src/test/regress/GNUmakefile -@@ -135,6 +135,7 @@ tablespace-setup: - REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS) - - check: all tablespace-setup -+ install -d /var/tmp/pgsql92/tmp_check - $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) - - 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) - - standbycheck: all -+ install -d /var/tmp/pgsql92/tmp_check - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing - - # old interfaces follow... -@@ -153,9 +155,11 @@ runtest: installcheck - runtest-parallel: installcheck-parallel - - bigtest: all tablespace-setup -+ install -d /var/tmp/pgsql92/tmp_check - $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big - - bigcheck: all tablespace-setup -+ install -d /var/tmp/pgsql92/tmp_check - $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big - - --- -1.7.12 - Added: csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -0,0 +1,25 @@ +From 158e154cada106c38691140b578f7286be0aa387 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 5 Oct 2013 09:42:10 +0200 +Subject: [PATCH] Use plain rpath + +--- + src/makefiles/Makefile.solaris | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris +index e459de3..a234c30 100644 +--- a/src/makefiles/Makefile.solaris ++++ b/src/makefiles/Makefile.solaris +@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes) + export_dynamic = -Wl,-E + rpath = -Wl,-rpath,'$(rpathdir)' + else +-rpath = -Wl,-R'$(rpathdir)' ++rpath = -R'$(rpathdir)' + endif + + DLSUFFIX = .so +-- +1.8.3.4 + Added: csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch (rev 0) +++ csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -0,0 +1,25 @@ +From a14f0984beedd1b816a1e1c7365180b89716a672 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 29 Sep 2013 15:41:42 +0200 +Subject: [PATCH] ecpg /usr/local/include replacement + +--- + src/interfaces/ecpg/preproc/ecpg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c +index 7b2634d..2befa06 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.8.3.4 + Deleted: csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch 2013-10-05 13:18:56 UTC (rev 22119) +++ csw/mgar/pkg/postgresql/trunk/files/0001-ecpg-usr-local-include-replacement.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -1,25 +0,0 @@ -From 3d38c6e422081129b880bf5bdd7ff8a7c370025a Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 16 Sep 2012 11:01:47 +0200 -Subject: [PATCH 1/2] ecpg /usr/local/include replacement - ---- - src/interfaces/ecpg/preproc/ecpg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c -index 7e7bae3..2e9b28c 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.12 - Deleted: csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch 2013-10-05 13:18:56 UTC (rev 22119) +++ csw/mgar/pkg/postgresql/trunk/files/0002-Use-plain-rpath.patch 2013-10-05 16:41:25 UTC (rev 22120) @@ -1,25 +0,0 @@ -From 127f64d1db4caf7674c739574abf5b3fbf72e784 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 16 Sep 2012 11:04:08 +0200 -Subject: [PATCH 2/2] Use plain rpath - ---- - src/makefiles/Makefile.solaris | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris -index e459de3..8729ee8 100644 ---- a/src/makefiles/Makefile.solaris -+++ b/src/makefiles/Makefile.solaris -@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes) - export_dynamic = -Wl,-E - rpath = -Wl,-rpath,'$(rpathdir)' - else --rpath = -Wl,-R'$(rpathdir)' -+rpath = -R$(rpathdir) - endif - - DLSUFFIX = .so --- -1.7.12 - Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-05 13:18:56 UTC (rev 22119) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-05 16:41:25 UTC (rev 22120) @@ -1,29 +1,6 @@ -postgresql92 (9.2.4,REV=2013.04.06) +postgresql93 (9.3.0,REV=2013.10.05) - * New upstream release 9.2.4. + * New upstream release 9.3.0. - -- Rafael Ostertag Fri, 05 Apr 2013 13:24:31 +0200 + -- Rafael Ostertag Sat, 05 Oct 2013 15:52:31 +0200 - -postgresql92 (9.2.2,REV=2012.12.09) - - * New upstream release 9.2.2. - - * pg_config: do not emit compiler optimization flags (see - https://www.opencsw.org/mantis/view.php?id=5025) - - -- Rafael Ostertag Sun, 09 Dec 2012 10:02:08 +0100 - - -postgresql92 (9.2.1,REV=2012.10.03) - - * New upstream release 9.2.1 - - -- Rafael Ostertag Tue, 02 Oct 2012 15:16:34 +0200 - - -postgresql92 (9.2.0,REV=2012.09.16) - - * New upstream release 9.2.0 - - -- Rafael Ostertag Sun, 16 Sep 2012 14:55:51 +0200 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 Oct 5 19:48:51 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 05 Oct 2013 17:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[22121] csw/mgar/pkg/postgresql/trunk/files/ 0000-Use-plain-rpath.patch Message-ID: Revision: 22121 http://gar.svn.sourceforge.net/gar/?rev=22121&view=rev Author: guengel Date: 2013-10-05 17:48:50 +0000 (Sat, 05 Oct 2013) Log Message: ----------- postgresql/trunk: Removed quotes from rpath. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch Modified: csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch 2013-10-05 16:41:25 UTC (rev 22120) +++ csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch 2013-10-05 17:48:50 UTC (rev 22121) @@ -16,7 +16,7 @@ rpath = -Wl,-rpath,'$(rpathdir)' else -rpath = -Wl,-R'$(rpathdir)' -+rpath = -R'$(rpathdir)' ++rpath = -R$(rpathdir) endif DLSUFFIX = .so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Oct 5 23:48:21 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 05 Oct 2013 21:48:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[22122] csw/mgar/pkg/opendbx/trunk Message-ID: Revision: 22122 http://gar.svn.sourceforge.net/gar/?rev=22122&view=rev Author: idogan23 Date: 2013-10-05 21:48:21 +0000 (Sat, 05 Oct 2013) Log Message: ----------- opendbx: Package reworkded, removed Oracle support, version bump Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile csw/mgar/pkg/opendbx/trunk/checksums Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-05 17:48:50 UTC (rev 22121) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-05 21:48:21 UTC (rev 22122) @@ -1,5 +1,5 @@ NAME = opendbx -VERSION = 1.4.5 +VERSION = 1.4.6 GARTYPE = v2 DESCRIPTION = A C library for accessing databases with a single API @@ -17,19 +17,21 @@ MASTER_SITES = http://www.linuxnetworks.de/opendbx/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWopendbx CSWopendbxdevel CSWopendbxmysql CSWopendbxsqlite3 CSWopendbxoracle -CATALOGNAME_CSWopendbx = opendbx -CATALOGNAME_CSWopendbxdevel = opendbx_devel -CATALOGNAME_CSWopendbxmysql = opendbx_mysql -CATALOGNAME_CSWopendbxsqlite3 = opendbx_sqlite3 -CATALOGNAME_CSWopendbxoracle = opendbx_oracle +PACKAGES = CSWlibopendbx1 +PACKAGES +=CSWlibopendbxdevel +PACKAGES += CSWlibopendbxmysql +PACKAGES += CSWlibopendbxsqlite3 -SPKG_DESC_CSWopendbx = $(DESCRIPTION) -SPKG_DESC_CSWopendbxdevel = $(DESCRIPTION), development package -SPKG_DESC_CSWopendbxmysql = $(DESCRIPTION), mysql backend package -SPKG_DESC_CSWopendbxsqlite3 = $(DESCRIPTION), sqlite3 backend package -SPKG_DESC_CSWopendbxsoracle = $(DESCRIPTION), oracle backend package +CATALOGNAME_CSWlibopendbx1 = libopendbx1 +CATALOGNAME_CSWlibopendbxdevel = libopendbxdevel +CATALOGNAME_CSWlibopendbxmysql = libopendbxmysql +CATALOGNAME_CSWlibopendbxsqlite3 = libopendbxsqlite3 +SPKG_DESC_CSWlibopendbx1 += $(DESCRIPTION), libopendbx.so.1 +SPKG_DESC_CSWlibopendbxdevel = $(DESCRIPTION), development package +SPKG_DESC_CSWlibopendbxmysql = $(DESCRIPTION), mysql backend package +SPKG_DESC_CSWlibopendbxsqlite3 = $(DESCRIPTION), sqlite3 backend package + # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -37,70 +39,35 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -GARCOMPILER = GCC3 +GARCOMPILER = GCC4 BUILD64_LIBS_ONLY = 1 EXTRA_BUILD_ISAS_i386 = pentium_pro EXTRA_BUILD_ISAS_sparc = sparcv8plus -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -EXTRA_INC = $(prefix)/mysql5/include/mysql $(prefix)/instantclient_10_2/sdk/include -EXTRA_LINKER_DIRS_MYSQL_32 = $(prefix)/mysql5/lib/mysql -EXTRA_LINKER_DIRS_ORACLE_32 += $(prefix)/instantclient_10_2 -EXTRA_LINKER_DIRS_MYSQL_64 = $(prefix)/mysql5/lib/64/mysql -EXTRA_LINKER_DIRS_ORACLE_64 += $(prefix)/instantclient_10_2/64 -EXTRA_LINKER_FLAGS = -L$(EXTRA_LINKER_DIRS_MYSQL_$(MEMORYMODEL)) -L$(EXTRA_LINKER_DIRS_ORACLE_$(MEMORYMODEL)) -EXTRA_RUNPATH_LINKER_FLAGS = -R$(EXTRA_LINKER_DIRS_MYSQL_$(MEMORYMODEL)) -R$(EXTRA_LINKER_DIRS_ORACLE_$(MEMORYMODEL)) +EXTRA_INC = $(prefix)/include/mysql CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-utils -CONFIGURE_ARGS += --with-backends="mysql sqlite3 oracle" +CONFIGURE_ARGS += --with-backends="mysql sqlite3" +CONFIGURE_ARGS += --enable-maintainer-mode -PKGFILES_CSWopendbxdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWopendbxmysql = $(call baseisadirs,$(libdir),opendbx/libmysqlbackend.*) -PKGFILES_CSWopendbxsqlite3 = $(call baseisadirs,$(libdir),opendbx/libsqlite3backend.*) -PKGFILES_CSWopendbxoracle = $(call baseisadirs,$(libdir),opendbx/liboraclebackend.*) +PKGFILES_CSWlibopendbxdevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibopendbxmysql = $(call baseisadirs,$(libdir),opendbx/libmysqlbackend.*) +PKGFILES_CSWlibopendbxsqlite3 = $(call baseisadirs,$(libdir),opendbx/libsqlite3backend.*) +PKGFILES_CSWlibopendbx1 = $(PKGFILES_RT) -CHECKPKG_OVERRIDES_CSWopendbxdevel += surplus-dependency|CSWopendbx -CHECKPKG_OVERRIDES_CSWopendbxmysql += surplus-dependency|CSWopendbx -CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += surplus-dependency|CSWopendbx -CHECKPKG_OVERRIDES_CSWopendbxoracle += surplus-dependency|CSWopendbx +RUNTIME_DEP_PKGS_CSWlibopendbxmysql += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibopendbxmysql += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlibopendbxdevel += CSWlibopendbx1 +RUNTIME_DEP_PKGS_CSWlibopendbxsqlite3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibopendbxsqlite3 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibstdc++6 -CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libsqlite3backend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libsqlite3backend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libsqlite3backend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxsqlite3 += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/libsqlite3backend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbx.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/libopendbxplus.so.1.0.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbx.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/libopendbxplus.so.1.0.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbx.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0. -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/libopendbx.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbx += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/libopendbxplus.so.1.0.0 -CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/libmysqlbackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/libmysqlbackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/libmysqlbackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxmysql += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/libmysqlbackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/amd64/opendbx/liboraclebackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2/64|opt/csw/lib/sparcv9/opendbx/liboraclebackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/opendbx/liboraclebackend.so.1.2.0 -CHECKPKG_OVERRIDES_CSWopendbxoracle += missing-dependency|CSWorainstclient102 -CHECKPKG_OVERRIDES_CSWopendbxoracle += bad-rpath-entry|/opt/csw/instantclient_10_2|opt/csw/lib/sparcv8plus/opendbx/liboraclebackend.so.1.2.0 +CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 -RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3corert -RUNTIME_DEP_PKGS_CSWopendbx += CSWgcc3g++rt -RUNTIME_DEP_PKGS_CSWopendbx += CSWggettextrt -RUNTIME_DEP_PKGS_CSWopendbxdevel += CSWopendbx -RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWgcc3corert -RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWzlib -RUNTIME_DEP_PKGS_CSWopendbxmysql += CSWmysql5rt -RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWgcc3corert -RUNTIME_DEP_PKGS_CSWopendbxsqlite3 += CSWsqlite3rt -RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWgcc3corert -RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWopendbx -RUNTIME_DEP_PKGS_CSWopendbxoracle += CSWorainstclient102 - include gar/category.mk Modified: csw/mgar/pkg/opendbx/trunk/checksums =================================================================== --- csw/mgar/pkg/opendbx/trunk/checksums 2013-10-05 17:48:50 UTC (rev 22121) +++ csw/mgar/pkg/opendbx/trunk/checksums 2013-10-05 21:48:21 UTC (rev 22122) @@ -1 +1 @@ -8347e9583d83c5186dea14f992c19dec opendbx-1.4.5.tar.gz +3e89d7812ce4a28046bd60d5f969263d opendbx-1.4.6.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 Sun Oct 6 01:04:45 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 05 Oct 2013 23:04:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[22123] csw/mgar/pkg/lang-python/sqlobject/trunk Message-ID: Revision: 22123 http://gar.svn.sourceforge.net/gar/?rev=22123&view=rev Author: wahwah Date: 2013-10-05 23:04:45 +0000 (Sat, 05 Oct 2013) Log Message: ----------- lang-python/sqlobject/trunk: New release Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile csw/mgar/pkg/lang-python/sqlobject/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-10-05 21:48:21 UTC (rev 22122) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile 2013-10-05 23:04:45 UTC (rev 22123) @@ -3,7 +3,7 @@ # $Id$ NAME = SQLObject -VERSION = 1.4.1 +VERSION = 1.5.0 CATEGORIES = python GARTYPE = v2 DESCRIPTION = Object Relational Manager for Python Modified: csw/mgar/pkg/lang-python/sqlobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-10-05 21:48:21 UTC (rev 22122) +++ csw/mgar/pkg/lang-python/sqlobject/trunk/checksums 2013-10-05 23:04:45 UTC (rev 22123) @@ -1 +1 @@ -3ded34ad4e3d0eb8a15d01e6d85f9264 SQLObject-1.4.1.tar.gz +87df4d7ec9f8729d102c519fba633ec1 SQLObject-1.5.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 6 09:45:57 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 06 Oct 2013 07:45:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[22124] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 22124 http://gar.svn.sourceforge.net/gar/?rev=22124&view=rev Author: idogan23 Date: 2013-10-06 07:45:54 +0000 (Sun, 06 Oct 2013) Log Message: ----------- opendbx: added checkpkg override for libopendbxplus Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-05 23:04:45 UTC (rev 22123) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:45:54 UTC (rev 22124) @@ -69,5 +69,6 @@ RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 +CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 6 09:54:00 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 06 Oct 2013 07:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[22125] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 22125 http://gar.svn.sourceforge.net/gar/?rev=22125&view=rev Author: idogan23 Date: 2013-10-06 07:54:00 +0000 (Sun, 06 Oct 2013) Log Message: ----------- opendbx: added checkpkg override for libopendbxplus Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:45:54 UTC (rev 22124) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:54:00 UTC (rev 22125) @@ -70,5 +70,6 @@ CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 +CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 6 09:56:54 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 06 Oct 2013 07:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[22126] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 22126 http://gar.svn.sourceforge.net/gar/?rev=22126&view=rev Author: idogan23 Date: 2013-10-06 07:56:54 +0000 (Sun, 06 Oct 2013) Log Message: ----------- opendbx: added dependencies for sqlite & mysql plugins Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:54:00 UTC (rev 22125) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:56:54 UTC (rev 22126) @@ -61,9 +61,11 @@ RUNTIME_DEP_PKGS_CSWlibopendbxmysql += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopendbxmysql += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlibopendbxmysql += CSWlibopendbx1 RUNTIME_DEP_PKGS_CSWlibopendbxdevel += CSWlibopendbx1 RUNTIME_DEP_PKGS_CSWlibopendbxsqlite3 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopendbxsqlite3 += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibopendbxsqlite3 += CSWlibopendbx1 RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Oct 6 10:03:03 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 06 Oct 2013 08:03:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[22127] csw/mgar/pkg/opendbx/trunk/Makefile Message-ID: Revision: 22127 http://gar.svn.sourceforge.net/gar/?rev=22127&view=rev Author: idogan23 Date: 2013-10-06 08:03:03 +0000 (Sun, 06 Oct 2013) Log Message: ----------- opendbx more checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/opendbx/trunk/Makefile Modified: csw/mgar/pkg/opendbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:56:54 UTC (rev 22126) +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 08:03:03 UTC (rev 22127) @@ -73,5 +73,7 @@ CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 +CHECKPKG_OVERRIDES_CSWlibopendbxmysql += surplus-dependency|CSWlibopendbx1 +CHECKPKG_OVERRIDES_CSWlibopendbxsqlite3 += surplus-dependency|CSWlibopendbx1 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 Sun Oct 6 10:46:29 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Sun, 6 Oct 2013 10:46:29 +0200 Subject: [csw-devel] SF.net SVN: gar:[22124] csw/mgar/pkg/opendbx/trunk/Makefile In-Reply-To: References: Message-ID: Hi Ihsan, > Am 06.10.2013 um 09:45 schrieb idogan23 at users.sourceforge.net: > > Revision: 22124 > http://gar.svn.sourceforge.net/gar/?rev=22124&view=rev > Author: idogan23 > Date: 2013-10-06 07:45:54 +0000 (Sun, 06 Oct 2013) > Log Message: > ----------- > opendbx: added checkpkg override for libopendbxplus > > Modified Paths: > -------------- > csw/mgar/pkg/opendbx/trunk/Makefile > > Modified: csw/mgar/pkg/opendbx/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-05 23:04:45 UTC (rev 22123) > +++ csw/mgar/pkg/opendbx/trunk/Makefile 2013-10-06 07:45:54 UTC (rev 22124) > @@ -69,5 +69,6 @@ > RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibstdc++6 > > CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 > +CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 Why are you not just use the standard naming scheme for the package? Best regards -- Dago > > 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 From ihsan at opencsw.org Sun Oct 6 10:56:48 2013 From: ihsan at opencsw.org (=?UTF-8?B?xLBoc2FuwqBEb8SfYW4=?=) Date: Sun, 06 Oct 2013 10:56:48 +0200 Subject: [csw-devel] SF.net SVN: gar:[22124] csw/mgar/pkg/opendbx/trunk/Makefile In-Reply-To: References: Message-ID: <525125D0.6030503@opencsw.org> Hi Dago, Am 06.10.2013 10:46, schrieb Dagobert Michelsen: >> RUNTIME_DEP_PKGS_CSWlibopendbx1 += CSWlibstdc++6 >> >> CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 >> +CHECKPKG_OVERRIDES_CSWlibopendbx1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libopendbxplus.so.1.0.0|soname=libopendbxplus.so.1|pkgname=CSWlibopendbx1|expected=CSWlibopendbxplus1 > > Why are you not just use the standard naming scheme for the package? The files libopendbx.so and libopendbxplus.so belong together and I didn't wanted to create a package with one file in at that can't be used with other packages. Ihsan -- ihsan at dogan.ch http://blog.dogan.ch/ From wahwah at users.sourceforge.net Sun Oct 6 11:18:26 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 09:18:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[22128] csw/mgar/pkg/lang-python/psycopg2/trunk Message-ID: Revision: 22128 http://gar.svn.sourceforge.net/gar/?rev=22128&view=rev Author: wahwah Date: 2013-10-06 09:18:25 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/psycopg2/trunk: New version, dual-Python package Modified Paths: -------------- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile csw/mgar/pkg/lang-python/psycopg2/trunk/checksums Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2013-10-06 08:03:03 UTC (rev 22127) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile 2013-10-06 09:18:25 UTC (rev 22128) @@ -1,6 +1,6 @@ # $Id$ NAME = psycopg2 -VERSION = 2.4.5 +VERSION = 2.5.1 CATEGORIES = python GARTYPE = v2 @@ -12,19 +12,18 @@ the features offered by PostgreSQL. endef -PACKAGES = CSWpy-psycopg2 -CATALOGNAME = py_psycopg2 +MASTER_SITES = http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-5/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + LICENSE = LICENSE BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpostgresql-dev -RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-psycopg2 += CSWlibpython2-7-1-0 -MASTER_SITES = http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/ -DISTFILES = $(NAME)-$(VERSION).tar.gz - -CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/lang-python/psycopg2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/psycopg2/trunk/checksums 2013-10-06 08:03:03 UTC (rev 22127) +++ csw/mgar/pkg/lang-python/psycopg2/trunk/checksums 2013-10-06 09:18:25 UTC (rev 22128) @@ -1 +1 @@ -075e4df465e9a863f288d5bdf6e6887e psycopg2-2.4.5.tar.gz +1b433f83d50d1bc61e09026e906d84c7 psycopg2-2.5.1.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 Oct 6 12:13:05 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 06 Oct 2013 10:13:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[22129] csw/mgar/pkg/postgresql/trunk/files Message-ID: Revision: 22129 http://gar.svn.sourceforge.net/gar/?rev=22129&view=rev Author: guengel Date: 2013-10-06 10:13:05 +0000 (Sun, 06 Oct 2013) Log Message: ----------- postgresql/trunk: Added DATACHECKSUMS configuration option. PGLOCALE now en_US.UTF-8 by default. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl csw/mgar/pkg/postgresql/trunk/files/changelog.CSW csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl 2013-10-06 09:18:25 UTC (rev 22128) +++ csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl 2013-10-06 10:13:05 UTC (rev 22129) @@ -36,14 +36,10 @@ is only recommended for pristine installations. -In order to start the PostgreSQL server you can either use +In order to start the PostgreSQL server use - svcadm enable cswpostgresql- at BASE_VERSION_NODOT@ # Solaris 10+ only + svcadm enable cswpostgresql- at BASE_VERSION_NODOT@ -or - - @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start - --- EOF else Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-06 09:18:25 UTC (rev 22128) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-06 10:13:05 UTC (rev 22129) @@ -1,6 +1,10 @@ -postgresql93 (9.3.0,REV=2013.10.05) +postgresql93 (9.3.0,REV=2013.10.06) * New upstream release 9.3.0. - -- Rafael Ostertag Sat, 05 Oct 2013 15:52:31 +0200 + * Database cluster will be initialized using UTF-8 encoding by default. + * /etc/opt/csw/postgresql-93.conf has new configuration option `DATACHECKSUMS'. + + -- Rafael Ostertag Sun, 06 Oct 2013 11:54:20 +0200 + Modified: csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl 2013-10-06 09:18:25 UTC (rev 22128) +++ csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl 2013-10-06 10:13:05 UTC (rev 22129) @@ -28,11 +28,13 @@ [ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} # Defaults -[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ -[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast -[ -z "${PGENCODING}" ] && PGENCODING=UTF8 -[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres -[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log +PGDATA=${PGDATA- at PGDATA@} +SHUTDOWNMODE=${SHUTDOWNMODE-fast} +PGENCODING=${PGENCODING-UTF8} +PGLOCALE=${PGLOCALE-en_US.UTF-8} +PGSUPERUSER=${PGSUPERUSER-postgres} +PGLOGOUTPUT=${PGLOGOUTPUT-${PGDATA}/postgresql.log} +DATACHECKSUMS=${DATACHECKSUMS-0} if [ -n "${SERVEROPTS}" ] then @@ -43,8 +45,17 @@ then PGLOCALE="--locale=${PGLOCALE}" fi +case "${DATACHECKSUMS}" in + [yY][eE][sS]|[tT][rR][uU][eE]|1) + DATACHECKSUMS="-k" + ;; + [nN][oO]|[fF][aA][lL][sS][eE]|0) + DATACHECKSUMS="" + ;; +esac + # 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 @@ -105,7 +116,7 @@ chown postgres "${PGDATA}" chmod 0700 "${PGDATA}" echo "Initialising PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}" + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE} ${DATACHECKSUMS}" ;; *) Modified: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl 2013-10-06 09:18:25 UTC (rev 22128) +++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl 2013-10-06 10:13:05 UTC (rev 22129) @@ -50,7 +50,7 @@ # If none is specified, the locale is inherited from the environment # that initdb runs in. # -# Default: +# Default: en_US.UTF-8 #PGLOCALE=en_US.UTF-8 # Selects the user name of the database superuser. This defaults to @@ -61,3 +61,14 @@ # # Default: postgres #PGSUPERUSER=postgres + +# Use checksums on data pages to help detect corruption by the I/O +# system that would otherwise be silent. Enabling checksums may incur +# a noticeable performance penalty. This option can only be set during +# initialization, and cannot be changed later. If set, checksums are +# calculated for all objects, in all databases. +# +# Set to 1 to enable checksums. 0 disables checksums. +# +# Default: 0 +#DATACHECKSUMS=0 \ 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 rthurner at users.sourceforge.net Sun Oct 6 12:38:02 2013 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 06 Oct 2013 10:38:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[22130] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 22130 http://gar.svn.sourceforge.net/gar/?rev=22130&view=rev Author: rthurner Date: 2013-10-06 10:38:01 +0000 (Sun, 06 Oct 2013) Log Message: ----------- mercurial, upgrade to hg-2.7.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2013-10-06 10:13:05 UTC (rev 22129) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2013-10-06 10:38:01 UTC (rev 22130) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.7.1 +VERSION = 2.7.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2013-10-06 10:13:05 UTC (rev 22129) +++ csw/mgar/pkg/mercurial/trunk/checksums 2013-10-06 10:38:01 UTC (rev 22130) @@ -1 +1 @@ -3313de3667902ae4dc82f29f5280294d mercurial-2.7.1.tar.gz +ec00ddc6aadfea1e11b23650cb741d53 mercurial-2.7.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 14:03:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 12:03:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[22131] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 22131 http://gar.svn.sourceforge.net/gar/?rev=22131&view=rev Author: lblume Date: 2013-10-06 12:03:58 +0000 (Sun, 06 Oct 2013) Log Message: ----------- ImageMagick/trunk: Bump version to 6.8.7-0 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 2013-10-06 10:38:01 UTC (rev 22130) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-10-06 12:03:58 UTC (rev 22131) @@ -1,6 +1,6 @@ NAME = imagemagick -VERSION = 6.8.6 -GARSUBREV = 9 +VERSION = 6.8.7 +GARSUBREV = 0 GARTYPE = v2 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -15,9 +15,6 @@ DISTNAME = ImageMagick-$(VERSION)-$(GARSUBREV) DISTFILES = $(DISTNAME).tar.xz -# Not needed anymore with GCC, I think -#PATCHFILES += 0001-Do-not-strip-norunpath.patch - PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GCC4 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2013-10-06 10:38:01 UTC (rev 22130) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2013-10-06 12:03:58 UTC (rev 22131) @@ -1 +1 @@ -20df51f2315a7ab44507383d175b1c50 ImageMagick-6.8.6-9.tar.xz +65dad501b11f295f0283efca7dae5b2d ImageMagick-6.8.7-0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 14:29:29 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 12:29:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[22132] csw/mgar/pkg/krb5-lib/trunk Message-ID: Revision: 22132 http://gar.svn.sourceforge.net/gar/?rev=22132&view=rev Author: lblume Date: 2013-10-06 12:29:29 +0000 (Sun, 06 Oct 2013) Log Message: ----------- krb5-lib/trunk: Bump to 1.9.5; add a link to the system's krb5.conf; recipe cleanup Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile csw/mgar/pkg/krb5-lib/trunk/checksums Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-06 12:03:58 UTC (rev 22131) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-06 12:29:29 UTC (rev 22132) @@ -5,7 +5,7 @@ # NAME = krb5 -VERSION = 1.9.2 +VERSION = 1.9.5 GARTYPE = v2 DESCRIPTION = MIT Kerberos 5 core libraries @@ -23,10 +23,10 @@ PATCHFILES = patch-man2html-perl.patch PATCHFILES += 0002-libintl-for-kproplog.patch # PATCHFILES += 0003-local-libraries-first-when-linking.patch -PATCHFILES += 0004-libkdb_ldap-isblank-define.patch -PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch +#PATCHFILES += 0004-libkdb_ldap-isblank-define.patch +#PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch # PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch -PATCHFILES += 0005-krb5_set_password_using_ccache.patch +#PATCHFILES += 0005-krb5_set_password_using_ccache.patch # PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -132,10 +132,7 @@ # We turn off almost everything as we are just interested in the library. NODIRPATHS = --docdir CONFIGURE_ARGS = $(DIRPATHS) -# --enable-ipv6 is deprecated and autodetected -#CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm -#CONFIGURE_ARGS += --disable-thread-support +CONFIGURE_ARGS += --enable-dns-for-realm CONFIGURE_ARGS += --enable-thread-support CONFIGURE_ARGS += --disable-static --disable-profiled CONFIGURE_ARGS += --without-ldap @@ -173,6 +170,12 @@ $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in @$(MAKECOOKIE) -# Remove Studio-specific arch references post-install-modulated: - gsed -i -e '/^[^#]/s/-xarch=[^ ]* //' -e '/^[^#]/s/-xchip=[^ ]* //' $(DESTDIR)$(bindir)/krb5-config + # Remove Studio-specific arch references + gsed -i \ + -e '/^[^#]/s/-xarch=[^ ]* //' \ + -e '/^[^#]/s/-xchip=[^ ]* //' \ + $(DESTDIR)$(bindir)/krb5-config + # Add a link to the system's Kerberos configuration + ginstall -m 755 -d $(DESTDIR)$(sysconfdir) + gln -s ../../krb5/krb5.conf $(DESTDIR)$(sysconfdir)/krb5.conf Modified: csw/mgar/pkg/krb5-lib/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/checksums 2013-10-06 12:03:58 UTC (rev 22131) +++ csw/mgar/pkg/krb5-lib/trunk/checksums 2013-10-06 12:29:29 UTC (rev 22132) @@ -1 +1 @@ -8de1e9111612f0af0b0560789ae11cb9 krb5-1.9.2-signed.tar +74de3495dd3c0ccfd46401f95b1b4b1d krb5-1.9.5-signed.tar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 6 16:11:02 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 14:11:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[22133] csw/mgar/pkg/lang-python/python-cjson/trunk/ Makefile Message-ID: Revision: 22133 http://gar.svn.sourceforge.net/gar/?rev=22133&view=rev Author: wahwah Date: 2013-10-06 14:11:02 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/python-cjson/trunk: dual-Python build Modified Paths: -------------- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-10-06 12:29:29 UTC (rev 22132) +++ csw/mgar/pkg/lang-python/python-cjson/trunk/Makefile 2013-10-06 14:11:02 UTC (rev 22133) @@ -19,14 +19,11 @@ DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = -# This package is used for package building, therefore must be packaged for -# all platforms where we build packages. -PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc -# No need to build on Solaris 10. We might enable that in the future. -# PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc - +RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibpython2-6-1-0 -CHECKPKG_OVERRIDES_CSWpy-cjson += surplus-dependency|CSWpython +RUNTIME_DEP_PKGS_CSWpy-cjson += CSWlibpython2-7-1-0 +CHECKPKG_OVERRIDES_CSWpy-cjson += python-package-missing-py-files + PACKAGES = CSWpy-cjson include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 6 17:08:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 15:08:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[22134] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22134 http://gar.svn.sourceforge.net/gar/?rev=22134&view=rev Author: wahwah Date: 2013-10-06 15:08:09 +0000 (Sun, 06 Oct 2013) Log Message: ----------- opencsw-manual/trunk: Added a note about old instructions. Small changes in the file. Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-06 14:11:02 UTC (rev 22133) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-06 15:08:09 UTC (rev 22134) @@ -9,7 +9,7 @@ If you prefer a video tutorial instead of a written document, there is a `packaging video tutorial`_ available. It covers a subset of this document, starting from a fresh Solaris 10 install and ends with a built package. It -takes about 2-3h to complete. +takes about 2-3h to complete. It covers the basic GAR setup. A build-farm is a set of hosts where you can build Solaris packages. You can connect Intel and SPARC hosts together to build a set of packages with one @@ -44,27 +44,25 @@ Base setup (required) --------------------- -The base setup is enough to build packages but does not allow to automatically -check your packages for errors. +The base setup is enough to start building packages. :: pkgutil -y -i gar_dev mgar gcc4core gcc4g++ sudo -Please note that this must be run as ``root``. +Please note that this must be run as ``root``. The rest of the instructions +assume they're executed as a regular user or are prepended with ``sudo``. Setup ``~/.garrc`` (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Finally, you need to create your personal ``~/.garrc`` configuration file. It -contains your name and e-mail address, both of which are included in the -meta-data of built packages. Further, GAR needs to know where to store -downloaded sources and generated packages. +The ``~/.garrc`` file is specific to your user and contains your name and +e-mail address. These values are later stored in the meta-data of packages +built by you. Further, GAR needs to know where to store downloaded sources +and generated packages. -Here's an example: +Here's an example:: -:: - # Data for pkginfo SPKG_PACKAGER = Dagobert Michelsen SPKG_EMAIL = dam at example.com @@ -119,21 +117,18 @@ Initialize the source tree (required) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -As regular user, initialize your local repository. **For obvious -security reasons, do not use** ``root``. +As regular user, initialize your local repository. -To initialize the source tree, you execute: +**For security reasons, do not do it as root**. :: mgar init -This will create, by default, in your home directory, the ``opencsw`` -entry. If you wish to use another place, please use a third argument, -e.g.: +This will create, by default, in your home directory, the ``~/opencsw`` +directory. If you wish to use another place, please use a third argument, +e.g.:: -:: - mgar init /tank/opencsw or set the ``BUILDTREE`` parameter in the configuration file @@ -141,14 +136,12 @@ Please make yourself familiar with `mgar`_. -To fetch all the build recipes, you execute: +To fetch all the build recipes, you execute:: -:: - mgar up --all -Beware that this takes a lot of time and creates hundreds of -directories and thousands files. +Beware that this takes a lot of time and creates hundreds of directories and +thousands of files. checkpkg database (optional) ---------------------------- @@ -161,35 +154,27 @@ Required packages ^^^^^^^^^^^^^^^^^ -Install the required packages: +Install the required packages:: -:: - sudo pkgutil --yes --install mysql5 mysql5client -Create a minimal configuration file: +Create a minimal configuration file:: -:: + echo "[mysqld]" | sudo tail -a /etc/opt/csw/my.cnf + echo "max_allowed_packet=64M" | sudo tail -a /etc/opt/csw/my.cnf - sudo echo >>/etc/opt/csw/my.cnf "[mysqld]" - sudo echo >>/etc/opt/csw/my.cnf "max_allowed_packet=64M" - This is needed since checkpkg stores objects in JSON, it sometimes stores values way bigger than the default allowed 1MB, as there are packages which require data structures larger than 32MB, hence the 64MB value. -You start the data base server: +You start the data base server:: -:: - sudo svcadm enable svc:/network/cswmysql5:default -Eventually, you make your installation secure: +Eventually, you make your installation secure:: -:: - sudo /opt/csw/bin/mysql_secure_installation and answer affirmatively to all the questions. @@ -204,12 +189,10 @@ mysql -u root -p > create database checkpkg; - > grant all privileges on checkpkg.* to "checkpkg" identified by "password"; + > grant all privileges on checkpkg.* to "checkpkg" identified by ""; > flush privileges; > exit; -Note that you must use your own value instead of ``password``. - To verify that your user creation is correct you can execute this: :: @@ -224,26 +207,35 @@ The database access configuration is held in ``/etc/opt/csw/checkpkg.ini``. You can also use a per-user file: ``~/.checkpkg/checkpkg.ini``. The format is -as follows: +as follows:: -:: - [database] type = mysql name = checkpkg host = mysql user = checkpkg - password = yourpassword + password = Initializing tables and indexes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The next step is creating the tables in the database: +**BEGIN OLD INSTRUCTIONS. As of October 2013, these instructions refer to the +old, broken code. They do not work. If you want to set up the checkpkg +database, you need to use the development version of the code, using the +development checkpkg database setup instructions.** +* `development checkpkg database setup instructions`_ + +The next step is creating the tables in the database. + +NOTE: All the ``bin/pkgdb`` commands here and below are meant to be executed +from GAR sources. + :: - pkgdb initdb + cd /path/to/gar/sources/v2 + bin/pkgdb initdb case-insensitive string comparison in MySQL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -304,8 +296,10 @@ updated. Otherwise your packages will be checked against an old state of the catalog. -Your database is now ready. +Your database is ready. +**END OLD INSTRUCTIONS.** + Multi-host setup (optional) --------------------------- @@ -386,8 +380,8 @@ Make sure you uninstall ``SUNWgmake``. That version is outdated and misses functions needed by GAR (e.g. abspath). -Install Java Package -++++++++++++++++++++ +Install the Java Package +++++++++++++++++++++++++ There are versions of JDK and JRE between Java 1.3 and Java 6 installed in ``/usr``. @@ -666,3 +660,8 @@ .. _mgar: http://wiki.opencsw.org/gar-wrapper + +.. _development checkpkg database setup instructions: + http://wiki.opencsw.org/checkpkg#toc20 + + 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 Oct 6 17:20:06 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 15:20:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[22135] csw/mgar/pkg/lang-python Message-ID: Revision: 22135 http://gar.svn.sourceforge.net/gar/?rev=22135&view=rev Author: wahwah Date: 2013-10-06 15:20:05 +0000 (Sun, 06 Oct 2013) Log Message: ----------- zope.event Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/zone-event/trunk/Makefile csw/mgar/pkg/lang-python/zone-event/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/zone-event/ Modified: csw/mgar/pkg/lang-python/zone-event/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2013-04-23 13:10:04 UTC (rev 20848) +++ csw/mgar/pkg/lang-python/zone-event/trunk/Makefile 2013-10-06 15:20:05 UTC (rev 22135) @@ -2,18 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = zope.interface -VERSION = 3.6.1 +NAME = zope.event +VERSION = 4.0.2 CATEGORIES = python GARTYPE = v2 -RUNTIME_DEP_PKGS_CSWpy-zope-interface += CSWlibpython2-6-1-0 LICENSE = LICENSE.txt -DESCRIPTION = Implementation of object interfaces in Python -define BLURB -endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/zope.interface -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DESCRIPTION = Simple event system +VENDOR_URL = http://pypi.python.org/pypi/$(NAME) +DISTFILES = $(DISTNAME).tar.gz PACKAGES = CSWpy-zope-interface -CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/lang-python/zone-event/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/checksums 2013-04-23 13:10:04 UTC (rev 20848) +++ csw/mgar/pkg/lang-python/zone-event/trunk/checksums 2013-10-06 15:20:05 UTC (rev 22135) @@ -1 +1 @@ -7a895181b8d10be4a7e9a3afa13cd3be zope.interface-3.6.1.tar.gz +e08dd299d428d77a1cfcbfe841b81872 zope.event-4.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 6 17:25:23 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 15:25:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[22136] csw/mgar/pkg/lang-python/zone-event/trunk/Makefile Message-ID: Revision: 22136 http://gar.svn.sourceforge.net/gar/?rev=22136&view=rev Author: wahwah Date: 2013-10-06 15:25:23 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/zone-event/trunk: The package name is CSWpy-zope-event Modified Paths: -------------- csw/mgar/pkg/lang-python/zone-event/trunk/Makefile Modified: csw/mgar/pkg/lang-python/zone-event/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zone-event/trunk/Makefile 2013-10-06 15:20:05 UTC (rev 22135) +++ csw/mgar/pkg/lang-python/zone-event/trunk/Makefile 2013-10-06 15:25:23 UTC (rev 22136) @@ -10,5 +10,5 @@ DESCRIPTION = Simple event system VENDOR_URL = http://pypi.python.org/pypi/$(NAME) DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-zope-interface +PACKAGES = CSWpy-zope-event include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 18:34:28 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 16:34:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22137] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 22137 http://gar.svn.sourceforge.net/gar/?rev=22137&view=rev Author: lblume Date: 2013-10-06 16:34:28 +0000 (Sun, 06 Oct 2013) Log Message: ----------- tcl85/trunk: Remove Studio-specific compiler options from script Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 15:25:23 UTC (rev 22136) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 16:34:28 UTC (rev 22137) @@ -105,7 +105,19 @@ post-install-modulated: @echo Creating tclsh link ln -s $(REN_TCLSH) $(DESTDIR)$(bindir)/tclsh - perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(libdir)/tclConfig.sh - perl -pi -e "s|/usr/local|$(prefix)|g" $(DESTDIR)$(mandir)/man1/tclsh.1 + # Remove wrong path + perl -pi -e "s|/usr/local|$(prefix)|g" \ + $(DESTDIR)$(libdir)/tclConfig.sh + perl -pi -e "s|/usr/local|$(prefix)|g" \ + $(DESTDIR)$(mandir)/man1/tclsh.1 + # Remove Studio-specific arch references + gsed -i \ + -e '/^[^#]/s/-xO[0-5][^ ]* //' \ + -e '/^[^#]/s/-xarch=[^ ]* //' \ + -e '/^[^#]/s/-xchip=[^ ]* //' \ + -e '/^[^#]/s/-norunpath[^ ]* //' \ + -e '/^[^#]/s/-lCrun[^ ]* //' \ + -e '/^[^#]/s/-lCstd[^ ]* //' \ + $(DESTDIR)$(libdir)/tclConfig.sh @$(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 Sun Oct 6 18:36:33 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 16:36:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[22138] csw/mgar/pkg/lang-python/cheetah/trunk Message-ID: Revision: 22138 http://gar.svn.sourceforge.net/gar/?rev=22138&view=rev Author: wahwah Date: 2013-10-06 16:36:33 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/cheetah/trunk: Update for dual-Python version package Modified Paths: -------------- csw/mgar/pkg/lang-python/cheetah/trunk/Makefile csw/mgar/pkg/lang-python/cheetah/trunk/checksums Modified: csw/mgar/pkg/lang-python/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cheetah/trunk/Makefile 2013-10-06 16:34:28 UTC (rev 22137) +++ csw/mgar/pkg/lang-python/cheetah/trunk/Makefile 2013-10-06 16:36:33 UTC (rev 22138) @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = cheetah -VERSION = 2.4.0 +NAME = Cheetah +VERSION = 2.4.4 CATEGORIES = python GARTYPE = v2 DESCRIPTION = A template engine and code generation tool @@ -15,12 +15,10 @@ emails and even Python code. endef SPKG_SOURCEURL = http://www.cheetahtemplate.org/ -MASTER_SITES = http://pypi.python.org/packages/source/C/Cheetah/ -DL_NAME = Cheetah -DISTNAME = $(DL_NAME)-$(VERSION) +DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz -CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah +RUNTIME_DEP_PKGS_CSWpy-cheetah += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-cheetah += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-cheetah += CSWlibpython2-7-1-0 include gar/category.mk Modified: csw/mgar/pkg/lang-python/cheetah/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/cheetah/trunk/checksums 2013-10-06 16:34:28 UTC (rev 22137) +++ csw/mgar/pkg/lang-python/cheetah/trunk/checksums 2013-10-06 16:36:33 UTC (rev 22138) @@ -1 +1 @@ -873f5440676355512f176fc4ac01011e Cheetah-2.4.0.tar.gz +853917116e731afbc8c8a43c37e6ddba Cheetah-2.4.4.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 Sun Oct 6 18:43:27 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 16:43:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[22139] csw/mgar/pkg/lang-python/pysqlite/ Message-ID: Revision: 22139 http://gar.svn.sourceforge.net/gar/?rev=22139&view=rev Author: wahwah Date: 2013-10-06 16:43:26 +0000 (Sun, 06 Oct 2013) Log Message: ----------- pysqlite: Removing recipe of an obsolete package Removed Paths: ------------- csw/mgar/pkg/lang-python/pysqlite/ 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 Oct 6 18:45:22 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 16:45:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[22140] csw/mgar/pkg/lang-python/pysqlite2/ Message-ID: Revision: 22140 http://gar.svn.sourceforge.net/gar/?rev=22140&view=rev Author: wahwah Date: 2013-10-06 16:45:22 +0000 (Sun, 06 Oct 2013) Log Message: ----------- pysqlite2: Removing the recipe of an obsolete package Removed Paths: ------------- csw/mgar/pkg/lang-python/pysqlite2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 18:55:00 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 16:55:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[22141] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 22141 http://gar.svn.sourceforge.net/gar/?rev=22141&view=rev Author: lblume Date: 2013-10-06 16:54:59 +0000 (Sun, 06 Oct 2013) Log Message: ----------- tcl85/trunk: Fix some variable names so the right file can be found Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcl85/trunk/checksums Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 16:54:59 UTC (rev 22141) @@ -8,8 +8,8 @@ SF_PROJECT = tcl MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)$(VERSION) -DISTFILES = $(DISTNAME)-src.tar.gz +DISTNAME = $(SF_PROJECT)$(VERSION) +DISTFILES = $(VERSION)-src.tar.gz # Separate build for Solaris 10 with DTrace support PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 Modified: csw/mgar/pkg/tcl85/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl85/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/tcl85/trunk/checksums 2013-10-06 16:54:59 UTC (rev 22141) @@ -1 +1 @@ -174b2b4c619ba8f96875d8a051917703 tcl8.5.12-src.tar.gz +174b2b4c619ba8f96875d8a051917703 8.5.12-src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sun Oct 6 19:32:02 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 06 Oct 2013 19:32:02 +0200 Subject: [csw-devel] SF.net SVN: gar:[22134] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst In-Reply-To: (wahwah@users.sourceforge.net's message of "Sun, 06 Oct 2013 15:08:09 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > Revision: 22134 > [...] > -This will create, by default, in your home directory, the ``opencsw`` > -entry. If you wish to use another place, please use a third argument, > -e.g.: > +This will create, by default, in your home directory, the ``~/opencsw`` > +directory. If you wish to use another place, please use a third argument, > +e.g.:: ~/opencsw is in the home directory, isn't it? -- Peter From lblume at users.sourceforge.net Sun Oct 6 19:36:27 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 17:36:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[22142] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 22142 http://gar.svn.sourceforge.net/gar/?rev=22142&view=rev Author: lblume Date: 2013-10-06 17:36:27 +0000 (Sun, 06 Oct 2013) Log Message: ----------- ImageMagick/trunk: libmagick++6 new soname change Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-10-06 16:54:59 UTC (rev 22141) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2013-10-06 17:36:27 UTC (rev 22142) @@ -63,15 +63,15 @@ RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgomp1 RUNTIME_DEP_PKGS_CSWlibmagickwand6q16hdri1 += CSWlibgcc-s1 -PACKAGES += CSWlibmagick++6q16hdri2 -CATALOGNAME_CSWlibmagick++6q16hdri2 = libmagick++6q16hdri2 -PKGFILES_CSWlibmagick++6q16hdri2 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.2\.0\.0) -PKGFILES_CSWlibmagick++6q16hdri2 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibmagick++6q16hdri2 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.2 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibmagickcore6q16hdri1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri2 += CSWlibstdc++6 +PACKAGES += CSWlibmagick++6q16hdri3 +CATALOGNAME_CSWlibmagick++6q16hdri3 = libmagick++6q16hdri3 +PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3\.0\.0) +PKGFILES_CSWlibmagick++6q16hdri3 += $(call baseisadirs,$(libdir),libMagick\+\+-6\.Q16HDRI\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibmagick++6q16hdri3 += Library from ImageMagick, libMagick++-6.Q16HDRI.so.3 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickcore6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibmagickwand6q16hdri1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmagick++6q16hdri3 += CSWlibstdc++6 PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries @@ -82,7 +82,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWimagemagick RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore6q16hdri1 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri2 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++6q16hdri3 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl PACKAGES += CSWimagemagick 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 Oct 6 19:53:28 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 17:53:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[22143] csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Message-ID: Revision: 22143 http://gar.svn.sourceforge.net/gar/?rev=22143&view=rev Author: wahwah Date: 2013-10-06 17:53:28 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/virtualenv/trunk: Dual Python version. Modified Paths: -------------- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2013-10-06 17:36:27 UTC (rev 22142) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2013-10-06 17:53:28 UTC (rev 22143) @@ -4,19 +4,22 @@ NAME = virtualenv VERSION = 1.10.1 -PACKAGES = CSWpy-virtualenv -CATALOGNAME_CSWpy-virtualenv = py_virtualenv CATEGORIES = python GARTYPE = v2 SPKG_DESC_CSWpy-virtualenv = Virtual Python Environment builder ARCHALL_CSWpy-virtualenv = 1 + define BLURB A tool to create isolated Python environments. endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/virtualenv -MASTER_SITES = http://pypi.python.org/packages/source/v/virtualenv/ + +PACKAGES = CSWpy-virtualenv +VENDOR_URL = http://pypi.python.org/pypi/virtualenv DISTFILES = $(NAME)-$(VERSION).tar.gz LICENSE = PKG-INFO +BUILD_DEP_PKGS += CSWpy-mock +DEP_PKGS = CSWpython-dev # /usr/share references are fine, these are docstrings. CHECKPKG_OVERRIDES_CSWpy-virtualenv += file-with-bad-content +CHECKPKG_OVERRIDES_CSWpy-virtualenv += surplus-dependency|CSWpython-dev include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 6 20:07:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 18:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[22144] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 22144 http://gar.svn.sourceforge.net/gar/?rev=22144&view=rev Author: wahwah Date: 2013-10-06 18:07:53 +0000 (Sun, 06 Oct 2013) Log Message: ----------- libsunperf/trunk: Build for Solaris 9 too Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 17:53:28 UTC (rev 22143) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 18:07:53 UTC (rev 22144) @@ -4,14 +4,15 @@ GARTYPE = v2 DESCRIPTION = Sun Studio U1 Performance Libraries -define BLURB -endef -MASTER_SITES = http://www.oracle.com/technetwork/server-storage/solarisstudio/documentation/ss12u1-distributionreadme-429216.txt +MASTER_SITES = http://www.oracle.com/technetwork/server-storage/solarisstudio/documentation/ DISTFILES = ss12u1-distributionreadme-429216.txt VENDOR_URL = http://www.oracle.com/technetwork/server-storage/solarisstudio/documentation/ss12u1-distributionreadme-429216.txt +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc + LICENSE = ss12u1-distributionreadme-429216.txt CONFIGURE_SCRIPTS = @@ -41,8 +42,14 @@ CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath +# They are binary blobs which we have no control of. +CHECKPKG_OVERRIDES_CSWlibsunperf2 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibsunperf3 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibsunperf7 += no-direct-binding + include gar/category.mk + SRCDIR-sparcv9 = v9 SRCDIR-amd64 = amd64 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sun Oct 6 20:08:07 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 06 Oct 2013 20:08:07 +0200 Subject: [csw-devel] SF.net SVN: gar:[22143] csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile In-Reply-To: (wahwah@users.sourceforge.net's message of "Sun, 06 Oct 2013 17:53:28 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > Revision: 22143 > http://gar.svn.sourceforge.net/gar/?rev=22143&view=rev > Author: wahwah > Date: 2013-10-06 17:53:28 +0000 (Sun, 06 Oct 2013) > Log Message: > ----------- > lang-python/virtualenv/trunk: Dual Python version. > [...] The package in unstable is already dual. It was released on August 27. -- Peter From guengel at users.sourceforge.net Sun Oct 6 20:28:24 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 06 Oct 2013 18:28:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[22145] csw/mgar/gar/v2 Message-ID: Revision: 22145 http://gar.svn.sourceforge.net/gar/?rev=22145&view=rev Author: guengel Date: 2013-10-06 18:28:23 +0000 (Sun, 06 Oct 2013) Log Message: ----------- Added chkdbcat and associated module. It is used to check the database catalog for errors. Added Paths: ----------- csw/mgar/gar/v2/bin/chkdbcat csw/mgar/gar/v2/lib/python/chkdbcat.py csw/mgar/gar/v2/lib/python/chkdbcat_test.py Added: csw/mgar/gar/v2/bin/chkdbcat =================================================================== --- csw/mgar/gar/v2/bin/chkdbcat (rev 0) +++ csw/mgar/gar/v2/bin/chkdbcat 2013-10-06 18:28:23 UTC (rev 22145) @@ -0,0 +1,53 @@ +#!/opt/csw/bin/python2.6 +# -*- python -*- + +import argparse +import logging +from lib.python import chkdbcat + +class MyCheckDBCatalog(chkdbcat.CheckDBCatalog): + """Class overriding CheckDBCatalog.notify()""" + def __init__(self, catrel, arch, osrel, fn_ts, chkcat, verbose=False): + super(MyCheckDBCatalog,self).__init__(catrel, arch, osrel, fn_ts, chkcat) + self.__verbose = verbose + + def notify(self, date, addr, pkginfo): + # TODO: Do actual notification. To be discussed. + if self.__verbose: print('Notify %s' % addr) + print(date, add, pkginfo) + + +def argparser(): + parser = argparse.ArgumentParser(description='Check Database Catalog.') + parser.add_argument('--debug', help='enable debug output', required=False, default=False, action='store_const', const=True) + parser.add_argument('--verbose', help='be verbose', required=False, default=False, action='store_const', const=True) + parser.add_argument('--arch', required=True) + parser.add_argument('--catalog-release', required=True) + parser.add_argument('--os-release', required=True) + parser.add_argument('--timestamp-file', default='/var/cache/chkdbcat/timestamp.json') + parser.add_argument('--chkcat-path', default='/opt/csw/bin/chkcat') + return parser.parse_args() + +def main(): + args = argparser() + + if args.debug: + logging.basicConfig(level=logging.DEBUG) + + if args.verbose: print("Checking Database Catalog {0} {2} {1}".format(args.catalog_release, args.arch, args.os_release)) + with MyCheckDBCatalog(args.catalog_release, args.arch, + args.os_release, args.timestamp_file, + args.chkcat_path, args.verbose) as checker: + success = checker.check() + if args.verbose: + if success: + print("Database Catalog {0} {2} {1}: OK".format(args.catalog_release, args.arch, args.os_release)) + else: + print("Database Catalog {0} {2} {1}: FAILED".format(args.catalog_release, args.arch, args.os_release)) + print("chkcat output") + print checker.stderr + + exit(0) if success else exit(1) + +if __name__ == '__main__': + main() Added: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py (rev 0) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2013-10-06 18:28:23 UTC (rev 22145) @@ -0,0 +1,409 @@ +"""Check catalog data stored in the database for consistency. + +Check catalog data stored in the database for consistency using Peter +Bonivart's chkcat. + +Notifications for invalid catalogs can be customized by overriding +CheckDBCat.notify(). + +""" +import cjson +import datetime +import dateutil.parser +import logging +import os.path +import shutil +import subprocess +import sys +import tempfile +from lib.python.shell import ShellCommand +from lib.python.rest import RestClient +from lib.python.generate_catalog_file import CatalogFileGenerator + +class FSLock(object): + """Simple Lock class + + Provide a simple locking mechanism using a directory as lock. + + """ + def __init__(self, dirname): + self.__dirname = dirname + + def __enter__(self): + """Create lock directory.""" + logging.debug("Create lock dir: %s", self.__dirname) + os.mkdir(self.__dirname) + return self + + def __exit__(self, t, v, tb): + """Remove lock directory.""" + logging.debug("Remove lock dir: %s", self.__dirname) + os.rmdir(self.__dirname) + + +class TimestampRecord(object): + """Record Timestamp for a given Catalog, Architecture, and OS Release into a json encoded file.""" + def __init__(self, fn): + """Constructor. + + "fn is" the filename to read from and write to. File will be + created if necessary and is not required to exist prior + instantiation of class. + + """ + self.__filename = fn + if os.path.exists(self.__filename): + self.__read_data() + else: + self.__ts_by_catalog={} + + def __enter__(self): + """Dummy.""" + return self + + def __exit__(self, exc_type, wdc1, wdc2): + """Save data to file.""" + if exc_type is None: + logging.debug("Save TimestampRecord to file") + self.save() + + def __read_data(self): + """Read json data into memory. + + Read json data from file and create a dictionary with + (catrel,arch,osrel) as key and string representation of + timestamp as value. + + Dictionary is stored in self.__ts_by_catalog + + """ + with open(self.__filename, "r") as fp: + keyval_list = cjson.decode(fp.read()) + ts_by_ctlg = dict((tuple(x), y) for x, y in keyval_list) + self.__ts_by_catalog = ts_by_ctlg + + def save(self): + """Save in memory data to file. + + Save self.__ts_by_catalog json encoded to file. If self.__ts_by_catalog is + empty, nothing will be done. + + """ + # We don't create an empty json file in order to prevent + # reading from an empty json file upon instanciation with + # the same file name + if not self.__ts_by_catalog: return + + with open(self.__filename, "w") as fp: + fp.write(cjson.encode(self.__ts_by_catalog.items())) + + def get(self, catrel, arch, osrel): + """Get time stamp for given catrel, arch, and osrel. + + Time stamp will be returned as datetime. None will be + returned if no time stamp has been recorded for catalog + triple. + + """ + catkey = (catrel, arch, osrel) + if self.__ts_by_catalog.has_key(catkey): + return dateutil.parser.parse(self.__ts_by_catalog[catkey]) + else: + return None + + def set(self, catrel, arch, osrel, date): + """Set time stamp for a given catrel, arch, and osrel. + + If date is an instance of datetime, the value obtained by + calling isoformat() will be stored. + + If date is an instance of str, it has to be a date in iso format. + + """ + assert date is not None + + catkey = (catrel, arch, osrel) + if isinstance(date, datetime.datetime): + self.__ts_by_catalog[catkey] = date.replace(microsecond=0).isoformat() + elif isinstance(date, str): + # try to convert string into datetime, so that we + # know it has proper format. + self.__ts_by_catalog[catkey] = dateutil.parser.parse(date).isoformat() + else: + raise TypeError("Expected instance of str or datetime, got %s" % str(type(date))) + + +class CatalogTiming(object): + """Fetch Catalog Timing information. + + Fetch Catalog Timing information, such as when packages have + been built and uploaded. + + """ + _epoch_start = datetime.datetime(datetime.MINYEAR,1,1,0,0,0,0) + + # Mapping of key name to list index with optional transformation. + # Used by __list_to_dict_generator() + __list_to_dict_translation = ( + ('pkg', 0), + ('version', 1), + ('spkg', 2), + ('fullname', 3), + ('md5', 4), + ('built', 10, + lambda x: CatalogTiming._epoch_start if x is None else dateutil.parser.parse(x)), + ('upload', 11, + lambda x: CatalogTiming._epoch_start if x is None else dateutil.parser.parse(x)), + ('uploadby', 12) + ) + + def __init__(self, catrel, arch, osrel): + self.__catrel = catrel + self.__arch = arch + self.__osrel = osrel + self.__timing_data = self.__json_list_to_dict(self.fetch()) + + def __list_to_dict_generator(self, l): + """Generate tuples suitable to create a dictionary. + + It uses the tuples t in self.__list_to_dict_translation to + extract the value at position t[1] in l using t[0] as key name. + + If len(t)==3, it assumes t[2] is callable and calls t[2] + with the value at position t[1] in l as argument. + + """ + for tr in self.__list_to_dict_translation: + if len(tr) == 2: + yield (tr[0], l[tr[1]]) + elif len(tr) == 3: + yield (tr[0], tr[2](l[tr[1]])) + + def __json_list_to_dict(self, jdat): + """Translate json encoded timing data to a list of dictionaries. + + Returns a list of dicts decoded from json input. + + Json input "jdat" is expect to have the form: + + [ + [ + "libz1", + "1.2.8,REV=2013.09.17", + "CSWlibz1", + "libz1-1.2.8,REV=2013.09.17-SunOS5.10-sparc-CSW.pkg.gz", + "7684a5d3a096900f89f78c3c2dda3ff3", + 197630, + [...], + [...], + "libz1 - Zlib data compression library, libz.so.1", + 125, + "2013-09-17T07:13:30", + "2013-09-17T10:36:15", + "raos" + ], + . . . + ] + + + Output is a list of dictionaries: + + [ + { "pkg": "libz1", + "version": "1.2.8,REV=2013.09.17", + "spkg": "CSWlibz1", + "fullname": "libz1-1.2.8,REV=2013.09.17-SunOS5.10-sparc-CSW.pkg.gz", + "md5": "7684a5d3a096900f89f78c3c2dda3ff3", + "built": "2013-09-17T07:13:30", + "upload": "2013-09-17T10:36:15", + "uploadby": "raos" + }, + . . . + ] + + """ + return [dict(self.__list_to_dict_genrator(v)) for v in jdat] + + def fetch(self): + """Fetch timing information using REST.""" + return RestClient().GetCatalogTimingInformation(self.__catrel, + self.__arch, + self.__osrel) + + def upload_newer_than(self, date): + """Retrieve timing information on upload newer than "date".""" + self.__timing_data.sort(key=lambda x: x['upload']) + + # now, find the first item having a `upload date'=>`date' + # in __timing_data and splice the list starting at that + # index up to the end. Since the list has been sorted in + # descending order, this gives all `upload date'=>`date' + index=0 + for f in self.__timing_data: + if f['upload']>=date: + break + index+=1 + + return self.__timing_data[index:] + + +class CheckDBCatalog(object): + """Check a catalog retrieved from the database. + + It retrieves a catalog from the database according to the + tripple (catrel,arch,osrel) and runs `chkcat' on the catalog. If + `chkcat' reports no errors, a time stamp will be written into a + file marking the last successful check. + + If `chkcat' finds errors, the last successful time stamp will be + used to find all newly uploaded packages since this last + successful check, using "CatalogTiming" class. In that case, the + time stamp will NOT be updated. + + Each new catalog to be checked is required to pass the check + initially, since no last successful time stamp is available. + + The class has to be used in a `with' statement, since the + temporary directory required is created by __enter__() and + removed by __exit__(). + + """ + def __init__(self, catrel, arch, osrel, fn_ts, chkcat="/opt/csw/bin/chkcat", + cattiming_class=CatalogTiming, + tsrecord_class=TimestampRecord): + """Constructor. + + "fn_ts" is the path name to the time stamp file. + + "chkcat" is the path to `chkcat'. By default + `/opt/csw/bin/chkcat'. + + "cattiming_class" and "tsrecord_class" are mainly used for + unit tests in order to provide classes with overridden + methods. + + """ + self.__catalogfgen = CatalogFileGenerator(catrel, arch, osrel) + self.__chkcat = chkcat + + # store for later use + self.__catrel = catrel + self.__arch = arch + self.__osrel = osrel + + # will be set by __enter__ and unset by __exit__ + self.tmpdir = None + + self.__tsrecord_class = tsrecord_class + self.__cattiming_class = cattiming_class + self.__timestamp_record = tsrecord_class(fn_ts) + + def __enter__(self): + assert self.tmpdir is None + self.tmpdir=tempfile.mkdtemp(dir='/var/tmp') + logging.debug("Created temp dir %s" % self.tmpdir) + return self + + def __exit__(self, wdc1, wdc2, wdc3): + """Cleanup temporary directory where catalog has been stored.""" + assert self.tmpdir is not None + logging.debug("Remove tmp directory %s" % (self.tmpdir,)) + shutil.rmtree(self.tmpdir) + self.tmpdir = None + + def __get_notification_address(self, pkginfo): + """Returns the address where the notification will be sent to. + + Find the email address according to package information "pkginfo"" + + """ + # In case 'uploadby' is non-conclusive, fall back to + # retrieve email address of maintainer. + if pkginfo['uploadby'] is not None and pkginfo['uploadby'] != "web": + return pkginfo['uploadby']+'@opencsw.org' + else: + return RestClient().GetMaintainerByMd5(pkginfo['md5'])['maintainer_email'] + + def notify(self, date, addr, pkginfo): + """Notification. + + Will be called for each "addr" once. "pkginfo" is a list + with packages as retrieved by 'CatalogTiming' since last + successful check. + + """ + logging.info("TO: %s" % addr) + [logging.info("packge %s uploaded since %s might have caused catalog break" % (p['fullname'],str(date))) for p in pkginfo] + + def fetch_db_cat(self): + """Fetch catalog stored in database into temporary direcotry.""" + assert self.tmpdir is not None + self.__catalogfgen.GenerateCatalog(self.tmpdir) + + def run_chkcat(self): + """Run `chkcat' on catalog retrieved into temporary directory.""" + assert self.tmpdir is not None + + logging.debug("Run chkcat on %s" % os.path.join(self.tmpdir, "catalog")) + (self.__chkcat_retval, + self.stdout, + self.stderr) = ShellCommand([self.__chkcat, + "-p", + os.path.join(self.tmpdir, "catalog")], + allow_error=True) + # see `/opt/csw/bin/chkcat -h' for details on the return code + return self.__chkcat_retval in (0,1) + + def check(self): + """Download the catalog and use chkcat on it. + + In case the catalog is invalid, a list of packages by + `uploader' will be composed and notify() called for each + uploader. + + Returns True upon successful check, False otherwise. + """ + retval = False + with FSLock('/tmp/CheckDBCat.lock'): + self.fetch_db_cat() + retval = self.run_chkcat() + + # Only record successful checks. + if retval: + with self.__timestamp_record: + self.__timestamp_record.set(self.__catrel, + self.__arch, + self.__osrel, + datetime.datetime.now()) + + # Compose list of packages uploaded since last successful + # check by `uploader'. + notifications = {} + if not retval: + lastsuccessful = self.__timestamp_record.get( + self.__catrel, + self.__arch, + self.__osrel) + + if lastsuccessful is None: + logging.warn("No successful catalog check recorded for %s,%s,%s" % + (self.__catrel, self.__arch, self.__osrel)) + return retval; + + newpkgs = self.__cattiming_class(self.__catrel, + self.__arch, + self.__osrel).upload_newer_than(lastsuccessful) + + # compose notifications list in a manner so that + # each email address is notified exactly once, even + # when several packages are affected. + notifications = {} + for np in newpkgs: + addr=self.__get_notification_address(np) + notifications.setdefault(addr,{ 'lastsuccessful': lastsuccessful }) + notifications[addr].setdefault('newpkgs', []).append(np) + + for n in notifications: + self.notify(notifications[n]['lastsuccessful'], n, notifications[n]['newpkgs']) + + return retval Property changes on: csw/mgar/gar/v2/lib/python/chkdbcat.py ___________________________________________________________________ Added: svn:keywords + Date Revision Author HeadURL Id Added: svn:eol-style + native Added: csw/mgar/gar/v2/lib/python/chkdbcat_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat_test.py (rev 0) +++ csw/mgar/gar/v2/lib/python/chkdbcat_test.py 2013-10-06 18:28:23 UTC (rev 22145) @@ -0,0 +1,288 @@ +"""Tests for chkdbcat.py.""" + +import os +import cjson +import datetime +import logging +import unittest +from lib.python.chkdbcat import TimestampRecord, CatalogTiming, CheckDBCatalog + +## +## Unit tests +## +class TCatalogTiming(CatalogTiming): + """Override fetch() for CatalogTiming. + + Class overrides fetch() for use in tests. + + """ + def fetch(self): + """Provide static data for unit test.""" + return cjson.decode("""[ + [ + "libz1", + "1.2.8,REV=2013.09.17", + "CSWlibz1", + "libz1-1.2.8,REV=2013.09.17-SunOS5.10-sparc-CSW.pkg.gz", + "7684a5d3a096900f89f78c3c2dda3ff3", + 197630, + [], + [], + "libz1 - Zlib data compression library, libz.so.1", + 125, + "2013-09-17T07:13:30", + "2013-09-17T10:36:15", + "raos" + ], + [ + "zlib_stub", + "1.2.8,REV=2013.09.17", + "CSWzlib", + "zlib_stub-1.2.8,REV=2013.09.17-SunOS5.10-all-CSW.pkg.gz", + "93f73a862bf07339badd723cf11eb0ca", + 1857, + [], + [], + "zlib_stub - Transitional package. Content moved to CSWlibz1", + 125, + "2013-09-17T07:16:39", + "2013-09-17T10:36:28", + "raos" + ], + [ + "389_admin", + "1.1.30,REV=2013.01.07", + "CSW389-admin", + "389_admin-1.1.30,REV=2013.01.07-SunOS5.10-sparc-CSW.pkg.gz", + "f7d9c15d13118a3d837849d581339a65", + 396732, + [], + [], + "389_admin - The 389 LDAP server Admin Tools", + 126, + "2013-01-07T11:53:26", + null, + null + ], + [ + "zsh", + "5.0.1,REV=2012.12.21", + "CSWzsh", + "zsh-5.0.1,REV=2012.12.21-SunOS5.10-sparc-CSW.pkg.gz", + "78420c21d8772b3ce72518ad91c82813", + 2176170, + [], + [], + "zsh - Powerful UNIX shell", + 98, + "2012-12-21T00:25:14", + null, + null + ], + [ + "zutils", + "1.0,REV=2013.07.05", + "CSWzutils", + "zutils-1.0,REV=2013.07.05-SunOS5.10-sparc-CSW.pkg.gz", + "82c42dd606530aebc230d813f324c3e5", + 161930, + [], + [], + "zutils - Utilities to deal with compressed and non-compressed files", + 3, + "2013-07-05T11:28:42", + "2013-07-05T13:31:57", + "dam" + ] +] +""") + + +class TestTimestampRecord(unittest.TestCase): + def setUp(self): + self.__tmpfile = "/tmp/TestTimestampRecord" + self.__now = datetime.datetime.now().replace(microsecond=0) + self.__fixture = [ + [ [(a,b,c) for a in ('unstable', 'kiel', 'testing')] + for b in ('i386', 'sparc') ] + for c in ('SunOS5.10', 'SunOS5.11')] + + def test_LastSuccessfulCheck_str(self): + """Single pass test writing and retrieving data from a file using string date.""" + try: + os.unlink(self.__tmpfile) + except: + pass + + # With statement used to make sure data is saved to disk + with TimestampRecord(self.__tmpfile) as obj: + obj.set('unstable', 'sparc', 'SunOS5.10', self.__now.isoformat()) + + obj = TimestampRecord(self.__tmpfile) + self.assertEqual(self.__now.isoformat(), obj.get('unstable', 'sparc', 'SunOS5.10').isoformat()) + + def test_Many_str(self): + """Multiple pass test writing and retrieving data from a file using string date.""" + try: + os.unlink(self.__tmpfile) + except: + pass + + with TimestampRecord(self.__tmpfile) as obj: + [[[obj.set(c[0], c[1], c[2], self.__now.isoformat()) for c in b] for b in a] for a in self.__fixture] + + obj = TimestampRecord(self.__tmpfile) + [[[self.assertEqual(self.__now.isoformat(),obj.get(c[0], c[1], c[2]).isoformat()) for c in b] for b in a] for a in self.__fixture] + + def test_LastSuccessfulCheck_obj(self): + """Single pass test writing and retrieving data from a file using datetime object.""" + try: + os.unlink(self.__tmpfile) + except: + pass + + with TimestampRecord(self.__tmpfile) as obj: + obj.set('unstable', 'sparc', 'SunOS5.10', self.__now) + + obj = TimestampRecord(self.__tmpfile) + self.assertEqual(self.__now.isoformat(), obj.get('unstable', 'sparc', 'SunOS5.10').isoformat()) + + def test_Many_obj(self): + """Multiple pass test writing and retrieving data from a file using datetime obj.""" + try: + os.unlink(self.__tmpfile) + except: + pass + + with TimestampRecord(self.__tmpfile) as obj: + [[[obj.set(c[0], c[1], c[2], self.__now) for c in b] for b in a] for a in self.__fixture] + + obj = TimestampRecord(self.__tmpfile) + [[[self.assertEqual(self.__now.isoformat(),obj.get(c[0], c[1], c[2]).isoformat()) for c in b] for b in a] for a in self.__fixture] + + def test_SetInvalidType(self): + """Test set() with invalid type.""" + + with TimestampRecord(self.__tmpfile) as obj: + self.assertRaises(ValueError,obj.set,'unstable','i386','SunOS5.11',"abcd") + + with TimestampRecord(self.__tmpfile) as obj: + self.assertRaises(TypeError,obj.set,'unstable', 'i386', 'SunOS5.11', 1) + + def tearDown(self): + try: + os.unlink(self.__tmpfile) + except: + pass + + +class TestCatalogTiming(unittest.TestCase): + def test_Newer1(self): + obj = TCatalogTiming('unstable', 'sparc', 'SunOS5.10') + self.assertEqual( + len(obj.upload_newer_than(datetime.datetime(datetime.MINYEAR,1,1,0,0,0,0))), + 5 + ) + + def test_Newer2(self): + obj = TCatalogTiming('unstable', 'sparc', 'SunOS5.10') + self.assertEqual( + len(obj.upload_newer_than(datetime.datetime(2013,9,1,0,0,0,0))), + 2 + ) + + def test_Newer3(self): + obj = TCatalogTiming('unstable', 'sparc', 'SunOS5.10') + self.assertEqual( + len(obj.upload_newer_than(datetime.datetime(2040,1,1,0,0,0,0))), + 0 + ) + + +class TestCheckDBCatalog(unittest.TestCase): + class TCheckDBCatalogInvalid(CheckDBCatalog): + """Generate an invalid catalog.""" + def fetch_db_cat(self): + logging.debug('Create catalog %s' % + os.path.join(self.tmpdir,'catalog')) + with open(os.path.join(self.tmpdir,'catalog'), 'w') as fp: + # The catalog is invalid because several dependencies are missing + fp.write("""zsh 5.0.1,REV=2012.12.21 CSWzsh zsh-5.0.1,REV=2012.12.21-SunOS5.10-sparc-CSW.pkg.gz 78420c21d8772b3ce72518ad91c82813 2176170 CSWcommon|CSWlibiconv2|CSWlibncursesw5|CSWlibpcre1|CSWlibgdbm4 none none +zutils 1.0,REV=2013.07.05 CSWzutils zutils-1.0,REV=2013.07.05-SunOS5.10-sparc-CSW.pkg.gz 82c42dd606530aebc230d813f324c3e5 161930 CSWcas-texinfo|CSWcommon|CSWisaexec|CSWlzip none none""") + + + class TCheckDBCatalogValid(CheckDBCatalog): + def fetch_db_cat(self): + """Generate a valid catalog""" + logging.debug('Create catalog %s' % + os.path.join(self.tmpdir,'catalog')) + with open(os.path.join(self.tmpdir,'catalog'), 'w') as fp: + fp.write("""common 1.5,REV=2010.12.11 CSWcommon common-1.5,REV=2010.12.11-SunOS5.8-sparc-CSW.pkg f83ab71194e67e04d1eee5d8db094011 23040 none none none + zsh 5.0.1,REV=2012.12.21 CSWzsh zsh-5.0.1,REV=2012.12.21-SunOS5.10-sparc-CSW.pkg.gz 78420c21d8772b3ce72518ad91c82813 2176170 CSWcommon none none + zutils 1.0,REV=2013.07.05 CSWzutils zutils-1.0,REV=2013.07.05-SunOS5.10-sparc-CSW.pkg.gz 82c42dd606530aebc230d813f324c3e5 161930 CSWcommon none none""") + + + class TCheckDBCatalogNotification(TCheckDBCatalogInvalid): + expected_notification_on = { + 'dam at opencsw.org': { + 'lastsuccessful': datetime.datetime(2013,5,17,0,0,0), + 'newpkgs': [ + 'zutils-1.0,REV=2013.07.05-SunOS5.10-sparc-CSW.pkg.gz' + ] + }, + 'raos at opencsw.org': { + 'lastsuccessful': datetime.datetime(2013,5,17,0,0,0), + 'newpkgs': [ + 'libz1-1.2.8,REV=2013.09.17-SunOS5.10-sparc-CSW.pkg.gz', + 'zlib_stub-1.2.8,REV=2013.09.17-SunOS5.10-all-CSW.pkg.gz' + ] + } + } + + def notify(self, date, addr, pkginfo): + assert date == self.expected_notification_on[addr]['lastsuccessful'] + + if addr == "raos at opencsw.org": + assert len(pkginfo) == 2 + elif addr == "dam at opencsw.org": + assert len(pkginfo) == 1 + else: + raise Exception("Unexpected address") + + for p in pkginfo: + assert p['fullname'] in self.expected_notification_on[addr]['newpkgs'] + + + def setUp(self): + self.__timestamp_file = '/tmp/TestCheckDBCatalog.ts' + + def test_InvalidCatalog(self): + """Test a locally generated invalid catalog""" + + with self.TCheckDBCatalogInvalid('unstable','sparc','SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + self.assertFalse(test.check()) + + def test_ValidCatalog(self): + """Test a locally generated valid catalog""" + with self.TCheckDBCatalogValid('unstable','sparc','SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + self.assertFalse(test.check()) + + def test_Notification(self): + """Test notification for invalid catalog.""" + # Create last successful test time stamp for catalog to be tested + with TimestampRecord(self.__timestamp_file) as tsobj: + tsobj.set('unstable','sparc','SunOS5.10',datetime.datetime(2013,5,17,0,0,0)) + + with self.TCheckDBCatalogNotification('unstable', 'sparc', 'SunOS5.10', self.__timestamp_file, cattiming_class=TCatalogTiming) as test: + self.assertFalse(test.check()) + + def tearDown(self): + try: + os.unlink(self.__timestamp_file) + except: + pass + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/chkdbcat_test.py ___________________________________________________________________ Added: svn:keywords + Date Revision Author HeadURL Id Added: svn:eol-style + native 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 Oct 6 21:07:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 19:07:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[22146] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 22146 http://gar.svn.sourceforge.net/gar/?rev=22146&view=rev Author: wahwah Date: 2013-10-06 19:07:17 +0000 (Sun, 06 Oct 2013) Log Message: ----------- libsunperf/trunk: bad-rpath-entry overrides for specific packages Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 18:28:23 UTC (rev 22145) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 19:07:17 UTC (rev 22146) @@ -37,7 +37,9 @@ RUNTIME_DEP_PKGS += CSWsunmath RUNTIME_DEP_PKGS += CSWss12f95rt -CHECKPKG_OVERRIDES += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibsunperf2 += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibsunperf3 += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWlibsunperf7 += bad-rpath-entry CHECKPKG_OVERRIDES += soname-not-found CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath 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 Oct 6 21:29:33 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 19:29:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[22147] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 22147 http://gar.svn.sourceforge.net/gar/?rev=22147&view=rev Author: wahwah Date: 2013-10-06 19:29:33 +0000 (Sun, 06 Oct 2013) Log Message: ----------- libsunperf/trunk: Updated overrides for SPARC Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 19:07:17 UTC (rev 22146) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2013-10-06 19:29:33 UTC (rev 22147) @@ -40,9 +40,9 @@ CHECKPKG_OVERRIDES_CSWlibsunperf2 += bad-rpath-entry CHECKPKG_OVERRIDES_CSWlibsunperf3 += bad-rpath-entry CHECKPKG_OVERRIDES_CSWlibsunperf7 += bad-rpath-entry -CHECKPKG_OVERRIDES += soname-not-found -CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt -CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath +CHECKPKG_OVERRIDES_CSWlibsunperf7 += soname-not-found +CHECKPKG_OVERRIDES_CSWlibsunperf7 += surplus-dependency|CSWss12f95rt +CHECKPKG_OVERRIDES_CSWlibsunperf7 += surplus-dependency|CSWsunmath # They are binary blobs which we have no control of. CHECKPKG_OVERRIDES_CSWlibsunperf2 += no-direct-binding 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 Oct 6 22:51:11 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 06 Oct 2013 20:51:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[22148] csw/mgar/pkg/lang-python/numpy/trunk Message-ID: Revision: 22148 http://gar.svn.sourceforge.net/gar/?rev=22148&view=rev Author: wahwah Date: 2013-10-06 20:51:11 +0000 (Sun, 06 Oct 2013) Log Message: ----------- lang-python/numpy/trunk: version upgrade, dual Python version build Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile csw/mgar/pkg/lang-python/numpy/trunk/checksums Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2013-10-06 19:29:33 UTC (rev 22147) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2013-10-06 20:51:11 UTC (rev 22148) @@ -3,7 +3,7 @@ # $Id$ NAME = numpy -VERSION = 1.5.1rc1 +VERSION = 1.7.1 CATEGORIES = python GARTYPE = v2 @@ -16,25 +16,23 @@ endef SPKG_SOURCEURL = http://numpy.scipy.org/ -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES = $(DISTNAME).tar.gz -PACKAGES = CSWpy-numpy -CATALOGNAME = py_numpy - # the so version (and package names) for libsunperf differ depending # on platform SUNPERF_SO_sparc = 7 SUNPERF_SO_i386 = 3 SUNPERF_SO = $(SUNPERF_SO_$(GARCH)) +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibsunperf$(SUNPERF_SO) LICENSE = LICENSE.txt -EXTRA_CFLAGS = -xnorunpath +EXTRA_CFLAGS_2_6 = -xnorunpath +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(PYTHON_VERSION)) export ATLAS = None export BLAS = $(CC_HOME)/lib/libsunperf.so Modified: csw/mgar/pkg/lang-python/numpy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/checksums 2013-10-06 19:29:33 UTC (rev 22147) +++ csw/mgar/pkg/lang-python/numpy/trunk/checksums 2013-10-06 20:51:11 UTC (rev 22148) @@ -1 +1 @@ -5b4f1827b1af4a75edaff59e86404297 numpy-1.5.1rc1.tar.gz +0ab72b3b83528a7ae79c6df9042d61c6 numpy-1.7.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 23:42:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 21:42:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[22149] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 22149 http://gar.svn.sourceforge.net/gar/?rev=22149&view=rev Author: lblume Date: 2013-10-06 21:42:56 +0000 (Sun, 06 Oct 2013) Log Message: ----------- tcl85/trunk: Recipe fixes to build on Solaris 9 x86 Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 20:51:11 UTC (rev 22148) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-06 21:42:56 UTC (rev 22149) @@ -32,29 +32,26 @@ PACKAGES = CSWtcl SPKG_DESC_CSWtcl = Tcl programming language 8.5 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWtcl-i386 = CSWsunmath -RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)) # There are legacy packages depending on CSWtcl which require libtcl 8.4 FOREIGN_PACKAGES += CSWlibtcl8-4 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4 +#RUNTIME_DEP_PKGS_CSWtcl-i386-5.9 = CSWsunmath +#RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)-$(GAROSREL)) CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWlibtcl8-4 CHECKPKG_OVERRIDES_CSWtcl += unidentified-dependency|CSWlibtcl8-4 -# This is to find zoneinfo -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/local|root/opt/csw/share/man/mann/clock.n -CHECKPKG_OVERRIDES_CSWtcl += file-with-bad-content|/usr/share|root/opt/csw/share/man/mann/clock.n - PACKAGES += CSWlibtcl8-5 SPKG_DESC_CSWlibtcl8-5 = $(DESCRIPTION), libraries PKGFILES_CSWlibtcl8-5 += $(call pkgfiles_lib,libtcl8.5.so) PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.* # This dependency can not be tracked by checkpkg RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules +#RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386-5.9 += CSWsunmath +#RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)-$(GAROSREL)) CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules -RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386 += CSWsunmath -RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)) + # This is correct, the soname with *.so is really the one to use CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename @@ -74,7 +71,12 @@ PKGFILES_CSWtcl-dev += $(call baseisadirs,$(libdir),tclConfig.sh) RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5 -BUILD64 = 1 +# Enable 64 bits, but not for Solaris 9 x86 +BUILD64_5.9_sparc = 1 +BUILD64_5.10_sparc = 1 +BUILD64_5.9_i386 = +BUILD64_5.10_i386 = 1 +BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH)) ISAEXEC = 1 INCLUDE_FLAGS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 6 23:45:27 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 06 Oct 2013 21:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[22150] csw/mgar/pkg/krb5-lib Message-ID: Revision: 22150 http://gar.svn.sourceforge.net/gar/?rev=22150&view=rev Author: lblume Date: 2013-10-06 21:45:27 +0000 (Sun, 06 Oct 2013) Log Message: ----------- krb5-lib/trunk: Bump version to 1.11.3 Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile csw/mgar/pkg/krb5-lib/trunk/checksums Added Paths: ----------- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums Removed Paths: ------------- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-09-25 07:49:50 UTC (rev 21995) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile 2013-10-06 21:45:27 UTC (rev 22150) @@ -1,178 +0,0 @@ -# $Id$ -# -# ! The build links against the version of libkdb5 installed in the system, -# instead of the one built. -# - -NAME = krb5 -VERSION = 1.9.2 -GARTYPE = v2 - -DESCRIPTION = MIT Kerberos 5 core libraries -define BLURB - Kerberos is a network authentication protocol. It is designed to - provide strong authentication for client/server applications by - using secret-key cryptography. A free implementation of this protocol - is available from the Massachusetts Institute of Technology. - Kerberos is available in many commercial products as well. -endef - -MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ -DISTFILES = $(NAME)-$(VERSION)-signed.tar - -PATCHFILES = patch-man2html-perl.patch -PATCHFILES += 0002-libintl-for-kproplog.patch -# PATCHFILES += 0003-local-libraries-first-when-linking.patch -PATCHFILES += 0004-libkdb_ldap-isblank-define.patch -PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch -# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch -PATCHFILES += 0005-krb5_set_password_using_ccache.patch - -# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -BUILD_DEP_PKGS = CSWtcl - -# Uncomment for a better view of file-package allocations. -# PACKAGES = CSWdo-not-use -# SPKG_DESC_CSWdo-not-use = Do not use this catch all package - -# These packages are not part of the krb5libs build, but only the main server -#PACKAGES += CSWkrb5doc -PKGFILES_CSWkrb5doc = NOFILES -SPKG_DESC_CSWkrb5doc = Unused package 1 -#PACKAGES += CSWkrb5user -PKGFILES_CSWkrb5user = NOFILES -SPKG_DESC_CSWkrb5user = Unused package 2 -#PACKAGES += CSWkrb5kdc -PKGFILES_CSWkrb5kdc = NOFILES -SPKG_DESC_CSWkrb5kdc = Unused package 3 -#PACKAGES += CSWkrb5adminserver -PKGFILES_CSWkrb5adminserver = NOFILES -SPKG_DESC_CSWkrb5adminserver = Unused package 4 - -PACKAGES += CSWlibkrb5-dev -SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv -PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 -PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 -PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) -PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) -OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev -CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub - -PACKAGES += CSWlibcom-err3 -CATALOGNAME_CSWlibcom-err3 = libcom_err3 -PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3 -OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0 - -PACKAGES += CSWlibgssapi-krb5-2 -CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 -PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 -OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 - -PACKAGES += CSWlibk5crypto3 -CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 -PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3 -RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 -OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib - -PACKAGES += CSWlibkrb5-priv -SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) -PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) -# Private libraries in one common package. -CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 - -PACKAGES += CSWlibkrb5-3 -CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 -PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 - -PACKAGES += CSWlibkrb5support0 -CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 -PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 -OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib - -LICENSE = doc/copyright.texinfo - -EXTRA_LD_OPTIONS += -M $(abspath mapfile) - -EXTRA_CPPFLAGS += -D__EXTENSIONS__ - -CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure - -BUILD64_LIBS_ONLY = 1 - -# We turn off almost everything as we are just interested in the library. -NODIRPATHS = --docdir -CONFIGURE_ARGS = $(DIRPATHS) -# --enable-ipv6 is deprecated and autodetected -#CONFIGURE_ARGS += --enable-ipv6 -CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm -#CONFIGURE_ARGS += --disable-thread-support -CONFIGURE_ARGS += --enable-thread-support -CONFIGURE_ARGS += --disable-static --disable-profiled -CONFIGURE_ARGS += --without-ldap - -CONFIGURE_ARGS-32 += --with-tcl=$(prefix) -CONFIGURE_ARGS-64 += --without-tcl -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - -BUILD_SCRIPTS = $(WORKSRC)/src/Makefile - -TEST_SCRIPTS = $(WORKSRC)/src/Makefile - -# Some tests are failing: -# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin -# Running pass `tcp' ... -# server didn't start in 30 secondscan't read "expect_out(buffer)": no such -# variable -# while executing -# "verbose $expect_out(buffer) 1" -SKIPTEST ?= 1 - -INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile - -# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib -CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname -CATALOGNAME_CSWkrb5lib = krb5_lib_stub - -include gar/category.mk - -post-extract-modulated: - @# TODO: Check signature - cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -) - @# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path - perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \ - $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in - @$(MAKECOOKIE) - -# Remove Studio-specific arch references -post-install-modulated: - gsed -i -e '/^[^#]/s/-xarch=[^ ]* //' -e '/^[^#]/s/-xchip=[^ ]* //' $(DESTDIR)$(bindir)/krb5-config Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile (from rev 22132, csw/mgar/pkg/krb5-lib/trunk/Makefile) =================================================================== --- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile (rev 0) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile 2013-10-06 21:45:27 UTC (rev 22150) @@ -0,0 +1,182 @@ +# $Id$ +# +# ! The build links against the version of libkdb5 installed in the system, +# instead of the one built. +# + +NAME = krb5 +VERSION = 1.9.5 +GARTYPE = v2 + +DESCRIPTION = MIT Kerberos 5 core libraries +define BLURB + Kerberos is a network authentication protocol. It is designed to + provide strong authentication for client/server applications by + using secret-key cryptography. A free implementation of this protocol + is available from the Massachusetts Institute of Technology. + Kerberos is available in many commercial products as well. +endef + +MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ +DISTFILES = $(NAME)-$(VERSION)-signed.tar + +PATCHFILES = patch-man2html-perl.patch +PATCHFILES += 0002-libintl-for-kproplog.patch +# PATCHFILES += 0003-local-libraries-first-when-linking.patch +#PATCHFILES += 0004-libkdb_ldap-isblank-define.patch +#PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch +# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch +#PATCHFILES += 0005-krb5_set_password_using_ccache.patch + +# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS = CSWtcl + +# Uncomment for a better view of file-package allocations. +# PACKAGES = CSWdo-not-use +# SPKG_DESC_CSWdo-not-use = Do not use this catch all package + +# These packages are not part of the krb5libs build, but only the main server +#PACKAGES += CSWkrb5doc +PKGFILES_CSWkrb5doc = NOFILES +SPKG_DESC_CSWkrb5doc = Unused package 1 +#PACKAGES += CSWkrb5user +PKGFILES_CSWkrb5user = NOFILES +SPKG_DESC_CSWkrb5user = Unused package 2 +#PACKAGES += CSWkrb5kdc +PKGFILES_CSWkrb5kdc = NOFILES +SPKG_DESC_CSWkrb5kdc = Unused package 3 +#PACKAGES += CSWkrb5adminserver +PKGFILES_CSWkrb5adminserver = NOFILES +SPKG_DESC_CSWkrb5adminserver = Unused package 4 + +PACKAGES += CSWlibkrb5-dev +SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv +PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 +PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 +PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) +PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) +OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub + +PACKAGES += CSWlibcom-err3 +CATALOGNAME_CSWlibcom-err3 = libcom_err3 +PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3 +OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0 + +PACKAGES += CSWlibgssapi-krb5-2 +CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 +PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 +OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0 + +PACKAGES += CSWlibk5crypto3 +CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 +PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3 +RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 +OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib + +PACKAGES += CSWlibkrb5-priv +SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*) +# Private libraries in one common package. +CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3 + +PACKAGES += CSWlibkrb5-3 +CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) +PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(sysconfdir),krb5.conf) +SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib + +PACKAGES += CSWlibkrb5support0 +CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 +PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 + +LICENSE = doc/copyright.texinfo + +EXTRA_LD_OPTIONS += -M $(abspath mapfile) + +EXTRA_CPPFLAGS += -D__EXTENSIONS__ + +CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure + +BUILD64_LIBS_ONLY = 1 + +# We turn off almost everything as we are just interested in the library. +NODIRPATHS = --docdir +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-dns-for-realm +CONFIGURE_ARGS += --enable-thread-support +CONFIGURE_ARGS += --disable-static --disable-profiled +CONFIGURE_ARGS += --without-ldap + +CONFIGURE_ARGS-32 += --with-tcl=$(prefix) +CONFIGURE_ARGS-64 += --without-tcl +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +BUILD_SCRIPTS = $(WORKSRC)/src/Makefile + +TEST_SCRIPTS = $(WORKSRC)/src/Makefile + +# Some tests are failing: +# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin +# Running pass `tcp' ... +# server didn't start in 30 secondscan't read "expect_out(buffer)": no such +# variable +# while executing +# "verbose $expect_out(buffer) 1" +SKIPTEST ?= 1 + +INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile + +# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib +CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname +CATALOGNAME_CSWkrb5lib = krb5_lib_stub + +include gar/category.mk + +post-extract-modulated: + @# TODO: Check signature + cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -) + @# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path + perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \ + $(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in + @$(MAKECOOKIE) + +post-install-modulated: + # Remove Studio-specific arch references + gsed -i \ + -e '/^[^#]/s/-xarch=[^ ]* //' \ + -e '/^[^#]/s/-xchip=[^ ]* //' \ + $(DESTDIR)$(bindir)/krb5-config + # Add a link to the system's Kerberos configuration + ginstall -m 755 -d $(DESTDIR)$(sysconfdir) + gln -s ../../krb5/krb5.conf $(DESTDIR)$(sysconfdir)/krb5.conf Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/checksums 2013-09-25 07:49:50 UTC (rev 21995) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums 2013-10-06 21:45:27 UTC (rev 22150) @@ -1 +0,0 @@ -8de1e9111612f0af0b0560789ae11cb9 krb5-1.9.2-signed.tar Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums (from rev 22132, csw/mgar/pkg/krb5-lib/trunk/checksums) =================================================================== --- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums (rev 0) +++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums 2013-10-06 21:45:27 UTC (rev 22150) @@ -0,0 +1 @@ +74de3495dd3c0ccfd46401f95b1b4b1d krb5-1.9.5-signed.tar Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-06 21:42:56 UTC (rev 22149) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-06 21:45:27 UTC (rev 22150) @@ -4,8 +4,8 @@ # instead of the one built. # -NAME = krb5 -VERSION = 1.9.5 +NAME = krb5 +VERSION = 1.11.3 GARTYPE = v2 DESCRIPTION = MIT Kerberos 5 core libraries @@ -20,36 +20,10 @@ MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ DISTFILES = $(NAME)-$(VERSION)-signed.tar -PATCHFILES = patch-man2html-perl.patch -PATCHFILES += 0002-libintl-for-kproplog.patch -# PATCHFILES += 0003-local-libraries-first-when-linking.patch -#PATCHFILES += 0004-libkdb_ldap-isblank-define.patch -#PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch -# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch -#PATCHFILES += 0005-krb5_set_password_using_ccache.patch +GARCOMPILER = GCC4 -# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - BUILD_DEP_PKGS = CSWtcl -# Uncomment for a better view of file-package allocations. -# PACKAGES = CSWdo-not-use -# SPKG_DESC_CSWdo-not-use = Do not use this catch all package - -# These packages are not part of the krb5libs build, but only the main server -#PACKAGES += CSWkrb5doc -PKGFILES_CSWkrb5doc = NOFILES -SPKG_DESC_CSWkrb5doc = Unused package 1 -#PACKAGES += CSWkrb5user -PKGFILES_CSWkrb5user = NOFILES -SPKG_DESC_CSWkrb5user = Unused package 2 -#PACKAGES += CSWkrb5kdc -PKGFILES_CSWkrb5kdc = NOFILES -SPKG_DESC_CSWkrb5kdc = Unused package 3 -#PACKAGES += CSWkrb5adminserver -PKGFILES_CSWkrb5adminserver = NOFILES -SPKG_DESC_CSWkrb5adminserver = Unused package 4 - PACKAGES += CSWlibkrb5-dev SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 @@ -124,6 +98,7 @@ EXTRA_LD_OPTIONS += -M $(abspath mapfile) EXTRA_CPPFLAGS += -D__EXTENSIONS__ +EXTRA_LDFLAGS += -L$(libdir) -lintl CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure @@ -132,34 +107,20 @@ # We turn off almost everything as we are just interested in the library. NODIRPATHS = --docdir CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-dns-for-realm +CONFIGURE_ARGS += --enable-dns-for-realm CONFIGURE_ARGS += --enable-thread-support CONFIGURE_ARGS += --disable-static --disable-profiled CONFIGURE_ARGS += --without-ldap +CONFIGURE_ARGS += --with-readline +# To pick the right tclConfig.sh +CONFIGURE_ARGS += --with-tcl=$(libdir) -CONFIGURE_ARGS-32 += --with-tcl=$(prefix) -CONFIGURE_ARGS-64 += --without-tcl -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +BUILD_SCRIPTS = $(WORKSRC)/src/Makefile -BUILD_SCRIPTS = $(WORKSRC)/src/Makefile - TEST_SCRIPTS = $(WORKSRC)/src/Makefile -# Some tests are failing: -# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin -# Running pass `tcp' ... -# server didn't start in 30 secondscan't read "expect_out(buffer)": no such -# variable -# while executing -# "verbose $expect_out(buffer) 1" -SKIPTEST ?= 1 - INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile -# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib -CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname -CATALOGNAME_CSWkrb5lib = krb5_lib_stub - include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/krb5-lib/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/checksums 2013-10-06 21:42:56 UTC (rev 22149) +++ csw/mgar/pkg/krb5-lib/trunk/checksums 2013-10-06 21:45:27 UTC (rev 22150) @@ -1 +1 @@ -74de3495dd3c0ccfd46401f95b1b4b1d krb5-1.9.5-signed.tar +56f0ae274b285320b8a597cb89442449 krb5-1.11.3-signed.tar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 7 08:51:08 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Oct 2013 06:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[22151] csw/mgar/pkg/lang-python/numpy/trunk Message-ID: Revision: 22151 http://gar.svn.sourceforge.net/gar/?rev=22151&view=rev Author: wahwah Date: 2013-10-07 06:51:07 +0000 (Mon, 07 Oct 2013) Log Message: ----------- lang-python/numpy/trunk: mvec is a SPARC-only library Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/numpy/trunk/files/0001-mvec-is-a-SPARC-only-library.patch Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2013-10-06 21:45:27 UTC (rev 22150) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2013-10-07 06:51:07 UTC (rev 22151) @@ -18,6 +18,8 @@ SPKG_SOURCEURL = http://numpy.scipy.org/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-mvec-is-a-SPARC-only-library.patch + # the so version (and package names) for libsunperf differ depending # on platform SUNPERF_SO_sparc = 7 Added: csw/mgar/pkg/lang-python/numpy/trunk/files/0001-mvec-is-a-SPARC-only-library.patch =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/files/0001-mvec-is-a-SPARC-only-library.patch (rev 0) +++ csw/mgar/pkg/lang-python/numpy/trunk/files/0001-mvec-is-a-SPARC-only-library.patch 2013-10-07 06:51:07 UTC (rev 22151) @@ -0,0 +1,34 @@ +From c7eb64f6ee327a8cc9a5e79651b3fd10c9d45279 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 7 Oct 2013 08:49:16 +0200 +Subject: [PATCH] mvec is a SPARC-only library + +--- + numpy/distutils/fcompiler/sun.py | 6 +++++- + numpy/version.py | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py +index 85e2c33..4b6fc8e 100644 +--- a/numpy/distutils/fcompiler/sun.py ++++ b/numpy/distutils/fcompiler/sun.py +@@ -1,3 +1,5 @@ ++import distutils.util ++ + from numpy.distutils.ccompiler import simple_version_match + from numpy.distutils.fcompiler import FCompiler + +@@ -38,7 +40,9 @@ class SunFCompiler(FCompiler): + return ['-xtarget=generic'] + def get_libraries(self): + opt = [] +- opt.extend(['fsu','sunmath','mvec']) ++ opt.extend(['fsu','sunmath']) ++ if 'sun4u' in distutils.util.get_platform(): ++ opt.extend(['mvec']) + return opt + + if __name__ == '__main__': +-- +1.7.10.3 + 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 Oct 7 11:11:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Oct 2013 09:11:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[22152] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 22152 http://gar.svn.sourceforge.net/gar/?rev=22152&view=rev Author: dmichelsen Date: 2013-10-07 09:11:38 +0000 (Mon, 07 Oct 2013) Log Message: ----------- gtar/trunk: Update to 1.27 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2013-10-07 06:51:07 UTC (rev 22151) +++ csw/mgar/pkg/gtar/trunk/Makefile 2013-10-07 09:11:38 UTC (rev 22152) @@ -1,5 +1,5 @@ NAME = tar -VERSION = 1.26 +VERSION = 1.27 GARTYPE = v2 DESCRIPTION = GNU tape archiver @@ -16,19 +16,14 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES += 0001-Partial-working-xgetcwd.patch -# Apply patch from -# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8230#20 -PATCHFILES += 0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch - VENDOR_URL = http://www.gnu.org/software/tar/ PACKAGES = CSWgtar BUILD_DEP_PKGS = CSWgcpio RUNTIME_DEP_PKGS_CSWgtar += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtar += CSWiconv +RUNTIME_DEP_PKGS_CSWgtar += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgtar += CSWgcpio NOISALIST = 1 @@ -37,11 +32,6 @@ EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias -CHECKPKG_OVERRIDES_CSWgtar += file-with-bad-content|/usr/local|root/opt/csw/share/info/tar.info-1 - -# Test 56 is failing, reported upstream -SKIPTEST ?= 1 - include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2013-10-07 06:51:07 UTC (rev 22151) +++ csw/mgar/pkg/gtar/trunk/checksums 2013-10-07 09:11:38 UTC (rev 22152) @@ -1 +1 @@ -00d1e769c6af702c542cca54b728920d tar-1.26.tar.gz +9d4bc655d103b871248281db179eb0f5 tar-1.27.tar.gz Deleted: csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch =================================================================== --- csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch 2013-10-07 06:51:07 UTC (rev 22151) +++ csw/mgar/pkg/gtar/trunk/files/0001-Partial-working-xgetcwd.patch 2013-10-07 09:11:38 UTC (rev 22152) @@ -1,40 +0,0 @@ -From 8f6d3dd4fde6da12ea84807d0afc07ff56a62e10 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 29 Jun 2011 16:38:07 +0200 -Subject: [PATCH] Partial working xgetcwd - ---- - gnu/xgetcwd.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c -index 2f1da89..fd4c2f9 100644 ---- a/gnu/xgetcwd.c -+++ b/gnu/xgetcwd.c -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #include "xalloc.h" - -@@ -36,7 +37,14 @@ - char * - xgetcwd (void) - { -- char *cwd = getcwd (NULL, 0); -+ char *cwd; -+#ifdef HAVE_PARTLY_WORKING_GETCWD -+ cwd = getcwd (NULL, 0); -+#else -+ cwd = malloc(PATH_MAX); -+ if (cwd) -+ getcwd (cwd, PATH_MAX); -+#endif - if (! cwd && errno == ENOMEM) - xalloc_die (); - return cwd; --- -1.7.5.4 - Deleted: csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch =================================================================== --- csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch 2013-10-07 06:51:07 UTC (rev 22151) +++ csw/mgar/pkg/gtar/trunk/files/0002-Fix-endless-recursion-when-compiling-on-Solaris-9-an.patch 2013-10-07 09:11:38 UTC (rev 22152) @@ -1,63 +0,0 @@ -From 265b9d3dfad6bd260610413f3200f5050e81af49 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 29 Jun 2011 17:16:04 +0200 -Subject: [PATCH] Fix endless recursion when compiling on Solaris 9 and - running on Solaris 10 - ---- - gnu/sys_stat.in.h | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h -index 70f43e2..6346bd4 100644 ---- a/gnu/sys_stat.in.h -+++ b/gnu/sys_stat.in.h -@@ -357,7 +357,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - " - - - #if @GNULIB_FUTIMENS@ --# if @REPLACE_FUTIMENS@ -+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our futimens -+ implementation relies on futimesat, which on Solaris 10 makes an invocation -+ to futimens that is meant to invoke the libc's futimens(), not gnulib's -+ futimens(). */ -+# if @REPLACE_FUTIMENS@ || defined __sun - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef futimens - # define futimens rpl_futimens -@@ -370,7 +374,9 @@ _GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2])); - # endif - _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); - # endif -+# if @HAVE_FUTIMENS@ - _GL_CXXALIASWARN (futimens); -+# endif - #elif defined GNULIB_POSIXCHECK - # undef futimens - # if HAVE_RAW_DECL_FUTIMENS -@@ -614,7 +620,11 @@ _GL_WARN_ON_USE (stat, "stat is unportable - " - - - #if @GNULIB_UTIMENSAT@ --# if @REPLACE_UTIMENSAT@ -+/* Use the rpl_ prefix also on Solaris <= 9, because on Solaris 9 our utimensat -+ implementation relies on futimesat, which on Solaris 10 makes an invocation -+ to utimensat that is meant to invoke the libc's utimensat(), not gnulib's -+ utimensat(). */ -+# if @REPLACE_UTIMENSAT@ || defined __sun - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef utimensat - # define utimensat rpl_utimensat -@@ -633,7 +643,9 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, - _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, - struct timespec const times[2], int flag)); - # endif -+# if @HAVE_UTIMENSAT@ - _GL_CXXALIASWARN (utimensat); -+# endif - #elif defined GNULIB_POSIXCHECK - # undef utimensat - # if HAVE_RAW_DECL_UTIMENSAT --- -1.7.5.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Oct 7 11:20:30 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 07 Oct 2013 09:20:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[22153] csw/mgar/pkg/zabbix/trunk Message-ID: Revision: 22153 http://gar.svn.sourceforge.net/gar/?rev=22153&view=rev Author: wilbury Date: 2013-10-07 09:20:29 +0000 (Mon, 07 Oct 2013) Log Message: ----------- zabbix/trunk: Update to 2.0.9rc2 Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2013-10-07 09:11:38 UTC (rev 22152) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2013-10-07 09:20:29 UTC (rev 22153) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.0.7 +VERSION = 2.0.9rc2 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system @@ -38,8 +38,8 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 # These are just examples -CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 -CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 +#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 +#CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2013-10-07 09:11:38 UTC (rev 22152) +++ csw/mgar/pkg/zabbix/trunk/checksums 2013-10-07 09:20:29 UTC (rev 22153) @@ -1 +1 @@ -0e86f37e3acecc1e0b618af14edc5346 zabbix-2.0.7.tar.gz +cb7237e9dae1eee974b6f5754f902c4d zabbix-2.0.9rc2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 7 11:22:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 07 Oct 2013 09:22:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[22154] csw/mgar/pkg/rsync/trunk Message-ID: Revision: 22154 http://gar.svn.sourceforge.net/gar/?rev=22154&view=rev Author: dmichelsen Date: 2013-10-07 09:22:52 +0000 (Mon, 07 Oct 2013) Log Message: ----------- rsync/trunk: Update to 3.1.0 Modified Paths: -------------- csw/mgar/pkg/rsync/trunk/Makefile csw/mgar/pkg/rsync/trunk/checksums Modified: csw/mgar/pkg/rsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsync/trunk/Makefile 2013-10-07 09:20:29 UTC (rev 22153) +++ csw/mgar/pkg/rsync/trunk/Makefile 2013-10-07 09:22:52 UTC (rev 22154) @@ -3,7 +3,7 @@ # $Id$ NAME = rsync -VERSION = 3.0.9 +VERSION = 3.1.0 GARTYPE = v2 DESCRIPTION = Utility which provides fast incremental file transfer Modified: csw/mgar/pkg/rsync/trunk/checksums =================================================================== --- csw/mgar/pkg/rsync/trunk/checksums 2013-10-07 09:20:29 UTC (rev 22153) +++ csw/mgar/pkg/rsync/trunk/checksums 2013-10-07 09:22:52 UTC (rev 22154) @@ -1 +1 @@ -5ee72266fe2c1822333c407e1761b92b rsync-3.0.9.tar.gz +3be148772a33224771a8d4d2a028b132 rsync-3.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Oct 7 13:01:55 2013 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 07 Oct 2013 11:01:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[22155] csw/mgar/pkg Message-ID: Revision: 22155 http://gar.svn.sourceforge.net/gar/?rev=22155&view=rev Author: idogan23 Date: 2013-10-07 11:01:54 +0000 (Mon, 07 Oct 2013) Log Message: ----------- opendmarc: initial commit Added Paths: ----------- csw/mgar/pkg/opendmarc/ csw/mgar/pkg/opendmarc/branches/ csw/mgar/pkg/opendmarc/tags/ csw/mgar/pkg/opendmarc/trunk/ csw/mgar/pkg/opendmarc/trunk/Makefile csw/mgar/pkg/opendmarc/trunk/checksums csw/mgar/pkg/opendmarc/trunk/files/ csw/mgar/pkg/opendmarc/trunk/files/0001-milterdir.patch Added: csw/mgar/pkg/opendmarc/trunk/Makefile =================================================================== --- csw/mgar/pkg/opendmarc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opendmarc/trunk/Makefile 2013-10-07 11:01:54 UTC (rev 22155) @@ -0,0 +1,61 @@ +NAME = opendmarc +VERSION = 1.1.3 +GARTYPE = v2 + +DESCRIPTION = DMARC Milter Implementatin +define BLURB + OpenDMARC is an open source implementation of Domain-based Message + Authentication, Reporting & Conformance, or DMARC. It builds on the + successes of technologies such as DomainKeys Identified Mail (DKIM) + and the Sender Policy Framework (SPF) to create an infrastructure + that enforces policy on domain names that are visible to end users, + and creates a feedback framework for identifying and tracking + fraudulent use of domain names in email. + It includes a library for handling DMARC record parsing, + a database schema and tools for aggregating and processing transaction + history to produce DMARC reports, and a filter that ties it all together + with an MTA using the milter protocol. +endef + +MASTER_SITES = $(SF_MIRRORS) +VENDOR_URL = http://www.trusteddomain.org/opendmarc/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PATCHFILES += 0001-milterdir.patch + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-milter +CONFIGURE_ARGS += --with-sql-backend=mysql + +PACKAGES = CSWopendmarc +CATALOGNAME_CSWopendmarc = opendmarc +SPKG_DESC_CSWopendmarc = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWopendmarc += CSWlibopendmarc1 +RUNTIME_DEP_PKGS_CSWopendmarc += CSWlibidn11 + +PACKAGES += CSWlibopendmarc1 +CATALOGNAME_CSWlibopendmarc1 = libopendmarc1 +PKGFILES_CSWlibopendmarc1 += $(call baseisadirs,$(libdir),libopendmarc\.so\.1\.0\.1) +PKGFILES_CSWlibopendmarc1 += $(call baseisadirs,$(libdir),libopendmarc\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibopendmarc1 += $(DESCRIPTION), libopendmarc.so.1 +RUNTIME_DEP_PKGS_CSWlibopendmarc1 += CSWlibidn11 + +PACKAGES += CSWopendmarc-dev +CATALOGNAME_CSWopendmarc-dev = opendmarc_dev +SPKG_DESC_CSWopendmarc-dev += $(DESCRIPTION), development files +PKGFILES_CSWopendmarc-dev += /opt/csw/lib/libopendmarc.so +RUNTIME_DEP_PKGS_CSWopendmarc-dev += CSWlibopendmarc1 + +include gar/category.mk + +pre-configure-modulated: + cd $(WORKSRC) && aclocal + cd $(WORKSRC) && autoconf --force + cd $(WORKSRC) && automake -a -c -f + cd $(WORKSRC) && autoheader + @$(MAKECOOKIE) Added: csw/mgar/pkg/opendmarc/trunk/checksums =================================================================== --- csw/mgar/pkg/opendmarc/trunk/checksums (rev 0) +++ csw/mgar/pkg/opendmarc/trunk/checksums 2013-10-07 11:01:54 UTC (rev 22155) @@ -0,0 +1 @@ +e5342401033da043fa61507511ca72b9 opendmarc-1.1.3.tar.gz Added: csw/mgar/pkg/opendmarc/trunk/files/0001-milterdir.patch =================================================================== --- csw/mgar/pkg/opendmarc/trunk/files/0001-milterdir.patch (rev 0) +++ csw/mgar/pkg/opendmarc/trunk/files/0001-milterdir.patch 2013-10-07 11:01:54 UTC (rev 22155) @@ -0,0 +1,25 @@ +From 580015892b416e7818dc13d9874db4035d9b334b Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 7 Oct 2013 12:52:30 +0200 +Subject: [PATCH] milterdir + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 775db7c..42f3109 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,7 +273,7 @@ fi + + if test "$milterpath" = "auto" -o "$milterpath" = "yes" + then +- milterdirs="/usr/local /opt/local /usr" ++ milterdirs="/opt/csw" + for d in $milterdirs + do + if test -f $d/include/libmilter/mfapi.h +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 7 13:16:25 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Oct 2013 11:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[22156] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22156 http://gar.svn.sourceforge.net/gar/?rev=22156&view=rev Author: chninkel Date: 2013-10-07 11:16:25 +0000 (Mon, 07 Oct 2013) Log Message: ----------- openssl1/trunk: re-enabled sse2 for pentium_pro isa to have good performances Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:01:54 UTC (rev 22155) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:16:25 UTC (rev 22156) @@ -174,7 +174,7 @@ # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = no-sse2 solaris-x86-cc-sunw -pentium_pro_OS_COMPILER = no-sse2 solaris-x86-pentium_pro-cc-sunw +pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw amd64_OS_COMPILER = solaris64-x86_64-cc-sunw sparcv8_OS_COMPILER = solaris-sparcv8-cc-sunw This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 7 13:16:50 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Oct 2013 11:16:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[22157] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 22157 http://gar.svn.sourceforge.net/gar/?rev=22157&view=rev Author: chninkel Date: 2013-10-07 11:16:50 +0000 (Mon, 07 Oct 2013) Log Message: ----------- openssl1/trunk: re-enabled i386 isa and disabled sse2 for it to allow for old server to still use libcrypto Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:16:25 UTC (rev 22156) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:16:50 UTC (rev 22157) @@ -151,11 +151,16 @@ BUILD64 = 1 ISAEXEC = 1 +# We re-enable the i386 default ISA to be able +# to provide an isa not requiring sse2 for old servers +ISA_DEFAULT_i386 = i386 + # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 + # the openssl build system doesn't honor bindir # as it doesn't install 64 bits binaries in bin/{amd64,sparcv9} # we fix this at the merge step Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-07 11:16:25 UTC (rev 22156) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-07 11:16:50 UTC (rev 22157) @@ -1,6 +1,7 @@ openssl (1.0.1e,rev=2013.08.10) unstable - * Disabled sse2 support for the i386 architecture. + * Re-enabled the i386 isa and disabled sse2 support for it to allow + openssl to run on old servers (Closes: #5112). -- yann rouillard Thu, 03 Oct 2013 21:57:06 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 7 13:25:15 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 07 Oct 2013 11:25:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[22158] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22158 http://gar.svn.sourceforge.net/gar/?rev=22158&view=rev Author: chninkel Date: 2013-10-07 11:25:15 +0000 (Mon, 07 Oct 2013) Log Message: ----------- openssl1/trunk: removed useless overrides Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:16:50 UTC (rev 22157) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-07 11:25:15 UTC (rev 22158) @@ -63,17 +63,6 @@ # We use SUN perl, not the opencsw one CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl -# References to default path in documentation files, can be safely ignored -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_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 - ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Oct 7 14:28:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 07 Oct 2013 12:28:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[22159] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 22159 http://gar.svn.sourceforge.net/gar/?rev=22159&view=rev Author: lblume Date: 2013-10-07 12:28:01 +0000 (Mon, 07 Oct 2013) Log Message: ----------- tcl85/trunk: bump to 8.5.15; switch compiler to GCC4; improve the filter to remove GCC-specific parameters too; some other recipe fixes Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile csw/mgar/pkg/tcl85/trunk/checksums csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-07 11:25:15 UTC (rev 22158) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-07 12:28:01 UTC (rev 22159) @@ -1,5 +1,5 @@ NAME = tcl8.5 -VERSION = 8.5.12 +VERSION = 8.5.15 GARTYPE = v2 DESCRIPTION = Tcl programming language v8.5 @@ -9,18 +9,20 @@ SF_PROJECT = tcl MASTER_SITES = $(SF_MIRRORS) DISTNAME = $(SF_PROJECT)$(VERSION) -DISTFILES = $(VERSION)-src.tar.gz +DISTFILES = $(DISTNAME)-src.tar.gz # Separate build for Solaris 10 with DTrace support PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +GARCOMPILER = GCC4 + VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms REN_TCLSH = tclsh8.5 -PATCHDIR = $(WORKDIR)/$(DISTNAME) +#PATCHDIR = $(WORKDIR)/$(DISTNAME) #PATCHFILES += 0001-Enable-SONAME-in-library.patch #PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch @@ -36,8 +38,6 @@ # There are legacy packages depending on CSWtcl which require libtcl 8.4 FOREIGN_PACKAGES += CSWlibtcl8-4 RUNTIME_DEP_PKGS_CSWtcl += CSWlibtcl8-4 -#RUNTIME_DEP_PKGS_CSWtcl-i386-5.9 = CSWsunmath -#RUNTIME_DEP_PKGS_CSWtcl += $(RUNTIME_DEP_PKGS_CSWtcl-$(GARCH)-$(GAROSREL)) CHECKPKG_OVERRIDES_CSWtcl += surplus-dependency|CSWlibtcl8-4 CHECKPKG_OVERRIDES_CSWtcl += unidentified-dependency|CSWlibtcl8-4 @@ -47,8 +47,7 @@ PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.* # This dependency can not be tracked by checkpkg RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules -#RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386-5.9 += CSWsunmath -#RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)-$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules @@ -84,7 +83,12 @@ WORKSRC = $(WORKDIR)/$(DISTNAME)/unix CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-threads +CONFIGURE_ARGS-64 += --enable-64bit +CONFIGURE_ARGS-64-sparc += --enable-64bit-vis +CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL) +CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH) # DTrace support is currently broken, disable for now # Text relocation remains referenced @@ -92,9 +96,8 @@ # st 0x634 tclDTrace.o # ld: fatal: relocations remain against allocatable but non-writable sections # CONFIGURE_ARGS-5.10 += --enable-dtrace +# CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)) - INSTALL_ARGS = install install-libraries install-private-headers install-tzdata install-msgs # tk need the static tclstub library for some reason @@ -112,14 +115,19 @@ $(DESTDIR)$(libdir)/tclConfig.sh perl -pi -e "s|/usr/local|$(prefix)|g" \ $(DESTDIR)$(mandir)/man1/tclsh.1 - # Remove Studio-specific arch references + # Remove compiler-specific arch references + # Those compatible between GCC4 and Studio 12 are left in. gsed -i \ - -e '/^[^#]/s/-xO[0-5][^ ]* //' \ - -e '/^[^#]/s/-xarch=[^ ]* //' \ - -e '/^[^#]/s/-xchip=[^ ]* //' \ - -e '/^[^#]/s/-norunpath[^ ]* //' \ - -e '/^[^#]/s/-lCrun[^ ]* //' \ - -e '/^[^#]/s/-lCstd[^ ]* //' \ + -e '/^[^#]/s/-xO[0-5][^ ]* *//g' \ + -e '/^[^#]/s/-xarch=[^ ]* *//g' \ + -e '/^[^#]/s/-xchip=[^ ]* *//g' \ + -e '/^[^#]/s/-norunpath[^ ]* *//g' \ + -e '/^[^#]/s/-lCrun[^ ]* *//g' \ + -e '/^[^#]/s/-lCstd[^ ]* *//g' \ + -e '/^[^#]/s/-mtune=[^ ]* *//g' \ + -e '/^[^#]/s/-march=[^ ]* *//g' \ + -e '/^[^#]/s/-Wall *//g' \ + -e '/^[^#]/s/-pipe *//g' \ $(DESTDIR)$(libdir)/tclConfig.sh @$(MAKECOOKIE) Modified: csw/mgar/pkg/tcl85/trunk/checksums =================================================================== --- csw/mgar/pkg/tcl85/trunk/checksums 2013-10-07 11:25:15 UTC (rev 22158) +++ csw/mgar/pkg/tcl85/trunk/checksums 2013-10-07 12:28:01 UTC (rev 22159) @@ -1 +1 @@ -174b2b4c619ba8f96875d8a051917703 8.5.12-src.tar.gz +f3df162f92c69b254079c4d0af7a690f tcl8.5.15-src.tar.gz Modified: csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2013-10-07 11:25:15 UTC (rev 22158) +++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2013-10-07 12:28:01 UTC (rev 22159) @@ -47,3 +47,16 @@ -- 1.7.11.3 +diff --git a/unix/configure b/unix/configure +index 753f7c0..5810fc3 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -8599,7 +8599,7 @@ else + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 8 00:55:20 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Oct 2013 22:55:20 +0000 Subject: SF.net SVN: gar:[22160] csw/mgar/pkg/lang-python/pygobject/trunk Message-ID: Revision: 22160 http://gar.svn.sourceforge.net/gar/?rev=22160&view=rev Author: wahwah Date: 2013-10-07 22:55:19 +0000 (Mon, 07 Oct 2013) Log Message: ----------- lang-python/pygobject/trunk: Upgrade to a newer version Modified Paths: -------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile csw/mgar/pkg/lang-python/pygobject/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2013-10-07 12:28:01 UTC (rev 22159) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2013-10-07 22:55:19 UTC (rev 22160) @@ -1,5 +1,7 @@ +# $Id$ + NAME = pygobject -VERSION = 2.21.1 +VERSION = 2.90.4 RELVER = $(shell echo $(VERSION) | gsed -e 's/\.[0-9]\+$$//') DESCRIPTION = Python bindings for the GObject library @@ -10,48 +12,45 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(NAME)/$(RELVER)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PATCHFILES = 0001-forcing-lglib-2.0.patch +# PATCHFILES = 0001-forcing-lglib-2.0.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +BUILD_DEP_PKGS = CSWlibffi-dev -PACKAGES += CSWlibpyglib2-0python0 -CATALOGNAME_CSWlibpyglib2-0python0 = libpyglib2_0python0 -PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0\.0\.0) -PKGFILES_CSWlibpyglib2-0python0 += $(call baseisadirs,$(libdir),libpyglib-2\.0-python\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibpyglib2-0python0 += $(DESCRIPTION), libpyglib-2.0-python.so.0 -RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibpyglib2-0python0 += CSWlibglib2-0-0 +PACKAGES += CSWlibpyglib-gi2-0python0 +PKGFILES_CSWlibpyglib-gi2-0python0 += $(call baseisadirs,$(libdir),libpyglib-gi-2\.0-python\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpyglib-gi2-0python0 += $(DESCRIPTION), libpyglib-gi-2.0-python.so.0 +RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib-gi2-0python0 +RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibpyglib-gi2-0python0 += CSWlibglib2-0-0 PACKAGES += CSWpy-gobject-dev OBSOLETED_BY_CSWpy-gobject-dev += CSWpygobject SPKG_DESC_CSWpy-gobject-dev = Development files for the Python GObject library RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWlibpyglib2-0python0 -RUNTIME_DEP_PKGS_CSWpy-gobject-dev += CSWpython # These are just comments CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/defsgen.py CHECKPKG_OVERRIDES_CSWpy-gobject-dev += file-with-bad-content|/usr/local|root/opt/csw/share/pygobject/2.0/codegen/h2def.py +CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py26-files +CHECKPKG_OVERRIDES_CSWpy-gobject-dev += python-package-missing-py-files PACKAGES += CSWpy-gobject OBSOLETED_BY_CSWpy-gobject += CSWpygobject SPKG_DESC_CSWpy-gobject = $(DESCRIPTION) -PKGFILES_CSWpy-gobject = $(libdir)/python/site-packages/.* -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWpython -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0 +PKGFILES_CSWpy-gobject = $(libdir)/python.*/site-packages/.* +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibffi4 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgirepository1-0-1 RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib2-0python0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpy-gobject += CSWlibpyglib-gi2-0python0 PYCOMPILE = 1 STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --without-ffi +# CONFIGURE_ARGS += --without-ffi ## Tests require gtk, but gtk requries gobject TEST_TARGET = check Property changes on: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/lang-python/pygobject/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/checksums 2013-10-07 12:28:01 UTC (rev 22159) +++ csw/mgar/pkg/lang-python/pygobject/trunk/checksums 2013-10-07 22:55:19 UTC (rev 22160) @@ -1,2 +1 @@ -bc2cdac34e1084f4d72eb2bf762e700c 0001-forcing-lglib-2.0.patch -c12eef0cd6725dc7245c3db78ef85d2d pygobject-2.21.1.tar.bz2 +ea5daef5c9d53efa445f6465c1fa0a2d pygobject-2.90.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 8 01:16:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Oct 2013 23:16:24 +0000 Subject: SF.net SVN: gar:[22161] csw/mgar/pkg/lang-python/beautifulsoup4/trunk Message-ID: Revision: 22161 http://gar.svn.sourceforge.net/gar/?rev=22161&view=rev Author: wahwah Date: 2013-10-07 23:16:23 +0000 (Mon, 07 Oct 2013) Log Message: ----------- lang-python/beautifulsoup4/trunk: Upgrade to 4.3.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/beautifulsoup4/trunk/Makefile csw/mgar/pkg/lang-python/beautifulsoup4/trunk/checksums Modified: csw/mgar/pkg/lang-python/beautifulsoup4/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/beautifulsoup4/trunk/Makefile 2013-10-07 22:55:19 UTC (rev 22160) +++ csw/mgar/pkg/lang-python/beautifulsoup4/trunk/Makefile 2013-10-07 23:16:23 UTC (rev 22161) @@ -1,18 +1,16 @@ # $Id$ NAME = beautifulsoup4 -VERSION = 4.2.1 +VERSION = 4.3.2 GARTYPE = v2 +CATEGORIES = python DESCRIPTION = Pythonic idioms for working with the HTML parse tree -CATEGORIES = python TEST_SCRIPTS = DISTFILES = $(DISTNAME).tar.gz ARCHALL_CSWpy-beautifulsoup4 = 1 BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += CSWpython27-dev -RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS += CSWlibpython2-7-1-0 include gar/category.mk Modified: csw/mgar/pkg/lang-python/beautifulsoup4/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/beautifulsoup4/trunk/checksums 2013-10-07 22:55:19 UTC (rev 22160) +++ csw/mgar/pkg/lang-python/beautifulsoup4/trunk/checksums 2013-10-07 23:16:23 UTC (rev 22161) @@ -1 +1 @@ -91ea70ce16a5f1f43e58f2ef05651679 beautifulsoup4-4.2.1.tar.gz +b8d157a204d56512a4cc196e53e7d8ee beautifulsoup4-4.3.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 8 01:33:05 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 07 Oct 2013 23:33:05 +0000 Subject: SF.net SVN: gar:[22162] csw/mgar/pkg/lang-python Message-ID: Revision: 22162 http://gar.svn.sourceforge.net/gar/?rev=22162&view=rev Author: wahwah Date: 2013-10-07 23:33:04 +0000 (Mon, 07 Oct 2013) Log Message: ----------- lang-python/six: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/six/trunk/Makefile csw/mgar/pkg/lang-python/six/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/six/ Modified: csw/mgar/pkg/lang-python/six/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/six/trunk/Makefile 2013-10-07 23:33:04 UTC (rev 22162) @@ -1,35 +1,17 @@ # $Id$ -NAME = python-dateutil -VERSION = 1.5 + +NAME = six +VERSION = 1.4.1 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module -define BLURB - Dateutil offers functionality such as computing relative time deltas, - computing dates based on flexible recurrence rules, generic parsing of - dates, handling of tzfile(5) format files and computing of Easter - Sunday for various calendars. -endef +DESCRIPTION = Python 2 and 3 compatibility utilities -MASTER_SITES = http://labix.org/download/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://labix.org/$(NAME)/ -BUILD_DEP_PKGS = CSWpy-setuptools -PACKAGES = CSWpy-dateutil +VENDOR_URL = https://pypi.python.org/pypi/six -UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ - -TEST_SCRIPTS = dateutil - LICENSE = LICENSE ARCHALL = 1 +TEST_SCRIPTS = -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/dateutil/tz.py -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/dateutil/tz.py - include gar/category.mk - -test-dateutil: - (cd $(WORKSRC); python test.py) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/six/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/six/trunk/checksums 2013-10-07 23:33:04 UTC (rev 22162) @@ -1 +1 @@ -35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz +bdbb9e12d3336c198695aa4cf3a61d62 six-1.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 10:30:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 08:30:57 +0000 Subject: SF.net SVN: gar:[22163] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 22163 http://gar.svn.sourceforge.net/gar/?rev=22163&view=rev Author: lblume Date: 2013-10-08 08:30:56 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tcl85/trunk: Switch back to Studio; Remove LDFLAGS patch that breaks testing; Dsiable using libsunmath in configure; some minor cleanup Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-07 23:33:04 UTC (rev 22162) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-08 08:30:56 UTC (rev 22163) @@ -15,8 +15,6 @@ PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -GARCOMPILER = GCC4 - VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms @@ -25,6 +23,8 @@ #PATCHDIR = $(WORKDIR)/$(DISTNAME) #PATCHFILES += 0001-Enable-SONAME-in-library.patch #PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch +#PATCHFILES += 0003_ld_lacks_LDFLAGS.patch +PATCHFILES += 0004-disable-libsunmath.patch # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: # @@ -47,7 +47,6 @@ PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.* # This dependency can not be tracked by checkpkg RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules -RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules @@ -71,10 +70,10 @@ RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtcl8-5 # Enable 64 bits, but not for Solaris 9 x86 -BUILD64_5.9_sparc = 1 +BUILD64_5.9_sparc = 1 BUILD64_5.10_sparc = 1 -BUILD64_5.9_i386 = -BUILD64_5.10_i386 = 1 +BUILD64_5.9_i386 = +BUILD64_5.10_i386 = 1 BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH)) ISAEXEC = 1 @@ -85,10 +84,10 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --enable-threads +# This is supposed to be needed for completeness, but what it does in configure +# is really questionable. Should not break stuff, though. CONFIGURE_ARGS-64 += --enable-64bit -CONFIGURE_ARGS-64-sparc += --enable-64bit-vis CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL) -CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL)-$(GARCH) # DTrace support is currently broken, disable for now # Text relocation remains referenced @@ -128,6 +127,7 @@ -e '/^[^#]/s/-march=[^ ]* *//g' \ -e '/^[^#]/s/-Wall *//g' \ -e '/^[^#]/s/-pipe *//g' \ + -e '/^[^#]/s/-KPIC/-fPIC/g' \ $(DESTDIR)$(libdir)/tclConfig.sh @$(MAKECOOKIE) Added: csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch (rev 0) +++ csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch 2013-10-08 08:30:56 UTC (rev 22163) @@ -0,0 +1,12 @@ +index d7bd53b..6c5d750 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -8869,7 +8869,7 @@ fi + if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then + + LIB_SUFFIX=${SHARED_LIB_SUFFIX} +- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' ++ MAKE_LIB='${LDFLAGS} ${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' + if test "${SHLIB_SUFFIX}" = ".dll"; then + + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' Added: csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch (rev 0) +++ csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch 2013-10-08 08:30:56 UTC (rev 22163) @@ -0,0 +1,12 @@ +index 6c5d750..3023fa5 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -8492,7 +8492,7 @@ else + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "xxx"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 8 12:04:04 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Oct 2013 10:04:04 +0000 Subject: SF.net SVN: gar:[22164] csw/mgar/pkg/gawk/trunk Message-ID: Revision: 22164 http://gar.svn.sourceforge.net/gar/?rev=22164&view=rev Author: dmichelsen Date: 2013-10-08 10:04:04 +0000 (Tue, 08 Oct 2013) Log Message: ----------- gawk/trunk: Update to 4.1.0 Modified Paths: -------------- csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gawk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2013-10-08 08:30:56 UTC (rev 22163) +++ csw/mgar/pkg/gawk/trunk/Makefile 2013-10-08 10:04:04 UTC (rev 22164) @@ -1,5 +1,5 @@ NAME = gawk -VERSION = 4.0.2 +VERSION = 4.1.0 GARTYPE = v2 DESCRIPTION = GNU awk @@ -17,16 +17,21 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.xz +PATCHFILES += 0001-Add-inclusion-of-mkdev.h-for-major-minor.patch + +# Use patch until this is fixed: +# http://lists.gnu.org/archive/html/bug-gawk/2013-10/msg00000.html +PATCHFILES += 0001-Allow-null-pointer-on-readline-detect.patch + PACKAGES += CSWgawk SPKG_DESC_CSWgawk = GNU awk # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgawk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgawk += CSWlibsigsegv2 RUNTIME_DEP_PKGS_CSWgawk += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWgawk += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgawk += CSWlibgmp10 -# This is just an example -CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gawk.1 - BUILD64 = 1 ISAEXEC = 1 @@ -36,15 +41,6 @@ # the replacement of uint64_t by upad64_t. EXTRA_CFLAGS = -Xc -D_XPG4_2 -Duint64_t=upad64_t -# These are install instructions for other platforms (os/2... 'nuff said.) -CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/share|root/opt/csw/share/info/gawk.info - -# These are instruction for awk, possible adjust them later -CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/info/gawk.info - -# This is an example path (YMMV in the docs) -CHECKPKG_OVERRIDES_CSWgawk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pgawk.1 - include gar/category.mk post-install: Modified: csw/mgar/pkg/gawk/trunk/checksums =================================================================== --- csw/mgar/pkg/gawk/trunk/checksums 2013-10-08 08:30:56 UTC (rev 22163) +++ csw/mgar/pkg/gawk/trunk/checksums 2013-10-08 10:04:04 UTC (rev 22164) @@ -1 +1 @@ -8a9b2f1170ac9dcd3eb13716b5ec4021 gawk-4.0.2.tar.xz +b18992ff8faf3217dab55d2d0aa7d707 gawk-4.1.0.tar.xz Added: csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch =================================================================== --- csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch (rev 0) +++ csw/mgar/pkg/gawk/trunk/files/0001-Add-inclusion-of-mkdev.h-for-major-minor.patch 2013-10-08 10:04:04 UTC (rev 22164) @@ -0,0 +1,25 @@ +From db9ef348f2cc44c63e96085210497e373a583497 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 2 Oct 2013 11:15:47 +0200 +Subject: [PATCH] Add inclusion of mkdev.h for major/minor + +--- + extension/filefuncs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/extension/filefuncs.c b/extension/filefuncs.c +index 1e8fc8d..f28e041 100644 +--- a/extension/filefuncs.c ++++ b/extension/filefuncs.c +@@ -46,6 +46,8 @@ + #include + #include + ++#include ++ + #include "gawkapi.h" + + #include "gettext.h" +-- +1.8.3.4 + Added: csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch =================================================================== --- csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch (rev 0) +++ csw/mgar/pkg/gawk/trunk/files/0001-Allow-null-pointer-on-readline-detect.patch 2013-10-08 10:04:04 UTC (rev 22164) @@ -0,0 +1,25 @@ +From 3924b644d63bcb5f7bbb4c39de13e1c72009e0d5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 8 Oct 2013 11:21:56 +0200 +Subject: [PATCH] Allow null pointer on readline detect + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 5ef6ac8..6408fcd 100755 +--- a/configure ++++ b/configure +@@ -10437,7 +10437,7 @@ int main(int argc, char **argv) + dup(fd); + line = readline("giveittome> "); + +- printf("got <%s>\n", line); ++ printf("got <%s>\n", line ? line : "(NULL)"); + return 0; + } + _ACEOF +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 8 12:24:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 10:24:54 +0000 Subject: SF.net SVN: gar:[22165] csw/mgar/pkg/lang-python/waitress/trunk Message-ID: Revision: 22165 http://gar.svn.sourceforge.net/gar/?rev=22165&view=rev Author: wahwah Date: 2013-10-08 10:24:54 +0000 (Tue, 08 Oct 2013) Log Message: ----------- lang-python/waitress/trunk: Upgrade to 0.8.7 Modified Paths: -------------- csw/mgar/pkg/lang-python/waitress/trunk/Makefile csw/mgar/pkg/lang-python/waitress/trunk/checksums Modified: csw/mgar/pkg/lang-python/waitress/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/waitress/trunk/Makefile 2013-10-08 10:04:04 UTC (rev 22164) +++ csw/mgar/pkg/lang-python/waitress/trunk/Makefile 2013-10-08 10:24:54 UTC (rev 22165) @@ -2,12 +2,10 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = waitress -VERSION = 0.8.2 +VERSION = 0.8.7 GARTYPE = v2 DESCRIPTION = Waitress WSGI server -define BLURB -endef CATEGORIES = python TEST_SCRIPTS = Modified: csw/mgar/pkg/lang-python/waitress/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/waitress/trunk/checksums 2013-10-08 10:04:04 UTC (rev 22164) +++ csw/mgar/pkg/lang-python/waitress/trunk/checksums 2013-10-08 10:24:54 UTC (rev 22165) @@ -1 +1 @@ -2d924c85bc1005174da1d14294fcc663 waitress-0.8.2.tar.gz +714f3d458d82a47f12fb168460de8366 waitress-0.8.7.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 Oct 8 13:25:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Oct 2013 11:25:54 +0000 Subject: SF.net SVN: gar:[22166] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 22166 http://gar.svn.sourceforge.net/gar/?rev=22166&view=rev Author: dmichelsen Date: 2013-10-08 11:25:53 +0000 (Tue, 08 Oct 2013) Log Message: ----------- xapian-core/trunk: Take care of xapian-config Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-10-08 10:24:54 UTC (rev 22165) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-10-08 11:25:53 UTC (rev 22166) @@ -43,6 +43,7 @@ PKGFILES_CSWlibxapian-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibxapian-dev += $(docdir)/xapian-core/apidoc/.* PKGFILES_CSWlibxapian-dev += .*\.cmake +PKGFILES_CSWlibxapian-dev += $(call baseisadirs,$(bindir),xapian-config-1.3) RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian1-3-1 EXTRA_LD_FLAGS += -norunpath @@ -53,6 +54,8 @@ BUILD64 = 1 ISAEXEC = 1 +EXTRA_ISAEXEC_EXCLUDE_FILES += $(bindir)/xapian-config-1.3 $(bindir)/%/xapian-config-1.3 + # This is just an example of the default install location CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 8 13:53:16 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 08 Oct 2013 11:53:16 +0000 Subject: SF.net SVN: gar:[22167] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22167 http://gar.svn.sourceforge.net/gar/?rev=22167&view=rev Author: pfelecan Date: 2013-10-08 11:53:16 +0000 (Tue, 08 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: create documentation sub-package 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 2013-10-08 11:25:53 UTC (rev 22166) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-08 11:53:16 UTC (rev 22167) @@ -168,6 +168,12 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 +PACKAGES += CSW$(NAME)-doc +CATALOGNAME_CSW$(NAME)-doc = $(NAME)_doc +SPKG_DESC_CSW$(NAME)-doc += $(DESCRIPTION), documentation +PKGFILES_CSW$(NAME)-doc += /opt/csw/share/info/mysql.info +ARCHALL_CSW$(NAME)-doc = 1 + # An example: # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used #CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused @@ -347,6 +353,8 @@ 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) + ginstall -m 755 -d $(DESTDIR)$(infodir) + ginstall -m 644 $(WORKSRC)/Docs/mysql.info $(DESTDIR)/$(infodir) @$(MAKECOOKIE) post-merge: 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 Oct 8 14:49:41 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Oct 2013 12:49:41 +0000 Subject: SF.net SVN: gar:[22168] csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/getting-started.rst Message-ID: Revision: 22168 http://gar.svn.sourceforge.net/gar/?rev=22168&view=rev Author: dmichelsen Date: 2013-10-08 12:49:41 +0000 (Tue, 08 Oct 2013) Log Message: ----------- opencsw-manual: Available packages is pkgutil -a Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-08 11:53:16 UTC (rev 22167) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/getting-started.rst 2013-10-08 12:49:41 UTC (rev 22168) @@ -33,7 +33,7 @@ You can now start installing packages. For a list of available packages use:: - /opt/csw/bin/pkgutil -l + /opt/csw/bin/pkgutil -a For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of ``PATH``, and ``/opt/csw/share/man`` in front of ``MANPATH``. On 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 Oct 8 14:59:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 08 Oct 2013 12:59:17 +0000 Subject: SF.net SVN: gar:[22169] csw/mgar/pkg/lua/trunk Message-ID: Revision: 22169 http://gar.svn.sourceforge.net/gar/?rev=22169&view=rev Author: dmichelsen Date: 2013-10-08 12:59:16 +0000 (Tue, 08 Oct 2013) Log Message: ----------- lua/trunk: Update to 5.2.2 Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lua/trunk/checksums Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2013-10-08 12:49:41 UTC (rev 22168) +++ csw/mgar/pkg/lua/trunk/Makefile 2013-10-08 12:59:16 UTC (rev 22169) @@ -5,7 +5,7 @@ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139 NAME = lua -VERSION = 5.2.1 +VERSION = 5.2.2 MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}') DESCRIPTION = Light-weight language designed for extending applications Modified: csw/mgar/pkg/lua/trunk/checksums =================================================================== --- csw/mgar/pkg/lua/trunk/checksums 2013-10-08 12:49:41 UTC (rev 22168) +++ csw/mgar/pkg/lua/trunk/checksums 2013-10-08 12:59:16 UTC (rev 22169) @@ -1 +1 @@ -ae08f641b45d737d12d30291a5e5f6e3 lua-5.2.1.tar.gz +efbb645e897eae37cad4344ce8b0a614 lua-5.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 15:03:50 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 13:03:50 +0000 Subject: SF.net SVN: gar:[22170] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22170 http://gar.svn.sourceforge.net/gar/?rev=22170&view=rev Author: lblume Date: 2013-10-08 13:03:50 +0000 (Tue, 08 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Changes are already under way 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 2013-10-08 12:59:16 UTC (rev 22169) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-08 13:03:50 UTC (rev 22170) @@ -168,12 +168,6 @@ CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/sparcv9/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/amd64/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 -PACKAGES += CSW$(NAME)-doc -CATALOGNAME_CSW$(NAME)-doc = $(NAME)_doc -SPKG_DESC_CSW$(NAME)-doc += $(DESCRIPTION), documentation -PKGFILES_CSW$(NAME)-doc += /opt/csw/share/info/mysql.info -ARCHALL_CSW$(NAME)-doc = 1 - # An example: # s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used #CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused @@ -353,8 +347,6 @@ 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) - ginstall -m 755 -d $(DESTDIR)$(infodir) - ginstall -m 644 $(WORKSRC)/Docs/mysql.info $(DESTDIR)/$(infodir) @$(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 Oct 8 16:51:57 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 14:51:57 +0000 Subject: SF.net SVN: gar:[22171] csw/mgar/pkg/lang-python/pyquery/trunk/Makefile Message-ID: Revision: 22171 http://gar.svn.sourceforge.net/gar/?rev=22171&view=rev Author: wahwah Date: 2013-10-08 14:51:56 +0000 (Tue, 08 Oct 2013) Log Message: ----------- lang-python/pyquery/trunk: BLURB is not necessary Modified Paths: -------------- csw/mgar/pkg/lang-python/pyquery/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyquery/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyquery/trunk/Makefile 2013-10-08 13:03:50 UTC (rev 22170) +++ csw/mgar/pkg/lang-python/pyquery/trunk/Makefile 2013-10-08 14:51:56 UTC (rev 22171) @@ -6,8 +6,6 @@ GARTYPE = v2 DESCRIPTION = A jquery-like library for python -define BLURB -endef CATEGORIES = python TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 8 18:11:48 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 08 Oct 2013 16:11:48 +0000 Subject: SF.net SVN: gar:[22172] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: Revision: 22172 http://gar.svn.sourceforge.net/gar/?rev=22172&view=rev Author: pfelecan Date: 2013-10-08 16:11:47 +0000 (Tue, 08 Oct 2013) Log Message: ----------- opencsw-manual/trunk: minor corrections after review Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-08 14:51:56 UTC (rev 22171) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2013-10-08 16:11:47 UTC (rev 22172) @@ -125,7 +125,7 @@ mgar init -This will create, by default, in your home directory, the ``~/opencsw`` +This will create, by default, in your home directory, the ``opencsw`` directory. If you wish to use another place, please use a third argument, e.g.:: @@ -161,8 +161,8 @@ Create a minimal configuration file:: - echo "[mysqld]" | sudo tail -a /etc/opt/csw/my.cnf - echo "max_allowed_packet=64M" | sudo tail -a /etc/opt/csw/my.cnf + echo "[mysqld]" | sudo tee -a /etc/opt/csw/my.cnf + echo "max_allowed_packet=64M" | sudo tee -a /etc/opt/csw/my.cnf This is needed since checkpkg stores objects in JSON, it sometimes stores values way bigger than the default allowed 1MB, as there are This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 19:27:54 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 17:27:54 +0000 Subject: SF.net SVN: gar:[22173] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 22173 http://gar.svn.sourceforge.net/gar/?rev=22173&view=rev Author: lblume Date: 2013-10-08 17:27:53 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tcl85/trunk: Short name of the package was inconsistent Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-08 16:11:47 UTC (rev 22172) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-08 17:27:53 UTC (rev 22173) @@ -1,4 +1,4 @@ -NAME = tcl8.5 +NAME = tcl VERSION = 8.5.15 GARTYPE = v2 @@ -8,7 +8,7 @@ SF_PROJECT = tcl MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJECT)$(VERSION) +DISTNAME = $(NAME)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz # Separate build for Solaris 10 with DTrace support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 21:22:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 19:22:37 +0000 Subject: SF.net SVN: gar:[22174] csw/mgar/pkg/tk85/trunk Message-ID: Revision: 22174 http://gar.svn.sourceforge.net/gar/?rev=22174&view=rev Author: lblume Date: 2013-10-08 19:22:36 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tk85/trunk: Bump to 8.5.15; Re-enable for Solaris 9 to follow Tcl; Some clean up Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile csw/mgar/pkg/tk85/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 17:27:53 UTC (rev 22173) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 19:22:36 UTC (rev 22174) @@ -1,5 +1,5 @@ NAME = tk -VERSION = 8.5.12 +VERSION = 8.5.15 GARTYPE = v2 DESCRIPTION = GUI toolkit for tcl @@ -12,20 +12,18 @@ DISTNAME = $(NAME)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz -PATCHFILES = Makefile.in.diff -PATCHDIR = $(WORKDIR)/$(DISTNAME) +#PATCHFILES = Makefile.in.diff +#PATCHDIR = $(WORKDIR)/$(DISTNAME) -#DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl -#DEP_PKGS_CSWtk += CSWlibxext -#DEP_PKGS_CSWtk += CSWlibxscrnsaver -#DEP_PKGS_CSWtk += CSWsunmath - # libsunmath support on Solaris 9 i386 is broken -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms +PATCHFILES += 0001-disable-libsunmath.patch + PACKAGES += CSWtk SPKG_DESC_CSWtk = GUI toolkit for tcl # PKGFILES is catchall @@ -35,17 +33,13 @@ RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH)) -# Leave the manpage for now -CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wish.1 - PACKAGES += CSWlibtk8-5 SPKG_DESC_CSWlibtk8-5 = GUI toolkit library for tcl, libtk8.5.so PKGFILES_CSWlibtk8-5 += $(call pkgfiles_lib,libtk8.5.so) PKGFILES_CSWlibtk8-5 += $(call baseisadirs,$(libdir),tk8.5/.*) +RUNTIME_DEP_PKGS_CSWlibtk8-5 += CSWlibxft2 +RUNTIME_DEP_PKGS_CSWlibtk8-5 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibtk8-5-i386 += CSWsunmath -RUNTIME_DEP_PKGS_CSWlibtk8-5 += $(RUNTIME_DEP_PKGS_CSWlibtk8-5-$(GARCH)) - # This is correct, the soname with *.so is really the one to use CHECKPKG_OVERRIDES_CSWlibtk8-5 += soname-equals-filename # This is just a demo @@ -59,12 +53,12 @@ PKGFILES_CSWtk-dev += $(call baseisadirs,$(libdir),tkConfig.sh) RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtk8-5 -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz - -BUILD64 = 1 +# Enable 64 bits, but not for Solaris 9 x86 +BUILD64_5.9_sparc = 1 +BUILD64_5.10_sparc = 1 +BUILD64_5.9_i386 = +BUILD64_5.10_i386 = 1 +BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH)) ISAEXEC = 1 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix Modified: csw/mgar/pkg/tk85/trunk/checksums =================================================================== --- csw/mgar/pkg/tk85/trunk/checksums 2013-10-08 17:27:53 UTC (rev 22173) +++ csw/mgar/pkg/tk85/trunk/checksums 2013-10-08 19:22:36 UTC (rev 22174) @@ -1 +1 @@ -a01640176845c1f654a412cfc9bab13b tk8.5.12-src.tar.gz +55b8e33f903210a4e1c8bce0f820657f tk8.5.15-src.tar.gz Added: csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch =================================================================== --- csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch (rev 0) +++ csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch 2013-10-08 19:22:36 UTC (rev 22174) @@ -0,0 +1,12 @@ +index 654b67d..b897519 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -6698,7 +6698,7 @@ else + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "xxx"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 8 21:36:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 19:36:49 +0000 Subject: SF.net SVN: gar:[22175] csw/mgar/pkg/lang-python Message-ID: Revision: 22175 http://gar.svn.sourceforge.net/gar/?rev=22175&view=rev Author: wahwah Date: 2013-10-08 19:36:49 +0000 (Tue, 08 Oct 2013) Log Message: ----------- wsgiproxy2: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/wsgiproxy2/trunk/Makefile csw/mgar/pkg/lang-python/wsgiproxy2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/wsgiproxy2/ Modified: csw/mgar/pkg/lang-python/wsgiproxy2/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/wsgiproxy2/trunk/Makefile 2013-10-08 19:36:49 UTC (rev 22175) @@ -1,35 +1,17 @@ # $Id$ -NAME = python-dateutil -VERSION = 1.5 +NAME = WSGIProxy2 +VERSION = 0.3 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module -define BLURB - Dateutil offers functionality such as computing relative time deltas, - computing dates based on flexible recurrence rules, generic parsing of - dates, handling of tzfile(5) format files and computing of Easter - Sunday for various calendars. -endef +DESCRIPTION = WSGI proxy -MASTER_SITES = http://labix.org/download/$(NAME)/ -DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://labix.org/$(NAME)/ -BUILD_DEP_PKGS = CSWpy-setuptools -PACKAGES = CSWpy-dateutil +DISTFILES = $(DISTNAME).zip +SPKG_SOURCEURL = https://pypi.python.org/pypi/WSGIProxy2 +PACKAGES = CSWpy-wsgiproxy2 -UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ +TEST_SCRIPTS = -TEST_SCRIPTS = dateutil - -LICENSE = LICENSE ARCHALL = 1 -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/dateutil/tz.py -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/dateutil/tz.py - include gar/category.mk - -test-dateutil: - (cd $(WORKSRC); python test.py) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/wsgiproxy2/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/wsgiproxy2/trunk/checksums 2013-10-08 19:36:49 UTC (rev 22175) @@ -1 +1 @@ -35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz +8b2cb207932eb8c341c3fa41f0cbe994 WSGIProxy2-0.3.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 22:26:21 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 20:26:21 +0000 Subject: SF.net SVN: gar:[22176] csw/mgar/pkg/tk85/trunk Message-ID: Revision: 22176 http://gar.svn.sourceforge.net/gar/?rev=22176&view=rev Author: lblume Date: 2013-10-08 20:26:21 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tk85/trunk: Reintroduce patch for Makefile now that it's clear what it does Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch Removed Paths: ------------- csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 19:36:49 UTC (rev 22175) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 20:26:21 UTC (rev 22176) @@ -12,9 +12,6 @@ DISTNAME = $(NAME)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz -#PATCHFILES = Makefile.in.diff -#PATCHDIR = $(WORKDIR)/$(DISTNAME) - # libsunmath support on Solaris 9 i386 is broken PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -23,6 +20,7 @@ LICENSE = license.terms PATCHFILES += 0001-disable-libsunmath.patch +PATCHFILES += 0002-CFLAGS-should-be-at-the-end.patch PACKAGES += CSWtk SPKG_DESC_CSWtk = GUI toolkit for tcl Copied: csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch (from rev 22151, csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff) =================================================================== --- csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch (rev 0) +++ csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch 2013-10-08 20:26:21 UTC (rev 22176) @@ -0,0 +1,28 @@ +index 3fb3d29..11401ce 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -320,20 +320,20 @@ MAN_FLAGS = @MAN_FLAGS@ + + CC = @CC@ + +-CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ ++CC_SWITCHES_NO_STUBS = ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ + -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ + -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} ${AC_FLAGS} \ + ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ +-${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ++${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} + + CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} + + APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ + +-DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ ++DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ + -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} \ + ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ +-${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ++${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} + + WISH_OBJS = tkAppInit.o + Deleted: csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff 2013-10-08 19:36:49 UTC (rev 22175) +++ csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff 2013-10-08 20:26:21 UTC (rev 22176) @@ -1,27 +0,0 @@ ---- tk8.5.8/unix/Makefile.in.orig 2009-11-13 19:38:48.000000000 +0100 -+++ tk8.5.8/unix/Makefile.in 2010-03-28 15:44:27.880721334 +0200 -@@ -326,20 +326,20 @@ - - CC = @CC@ - --CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -+CC_SWITCHES_NO_STUBS = ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ - -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \ - -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} ${AC_FLAGS} \ - ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \ --${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ -+${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} - - CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} - - APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ - --DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ -+DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \ - -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} \ - ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \ --${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ -+${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS} - - WISH_OBJS = tkAppInit.o - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 22:33:41 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 20:33:41 +0000 Subject: SF.net SVN: gar:[22177] csw/mgar/pkg/tk85/trunk/Makefile Message-ID: Revision: 22177 http://gar.svn.sourceforge.net/gar/?rev=22177&view=rev Author: lblume Date: 2013-10-08 20:33:40 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tk85/trunk: Add configure parameters already passed to Tcl Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 20:26:21 UTC (rev 22176) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 20:33:40 UTC (rev 22177) @@ -62,6 +62,12 @@ WORKSRC = $(WORKDIR)/$(DISTNAME)/unix CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared +CONFIGURE_ARGS += --enable-threads +# This is supposed to be needed for completeness, but what it does in configure +# is really questionable. Should not break stuff, though. +CONFIGURE_ARGS-64 += --enable-64bit +CONFIGURE_ARGS += CONFIGURE_ARGS-$(MEMORYMODEL) # tk need the static tclstub library for some reason MERGE_EXCLUDE_STATICLIBS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 8 23:34:05 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 08 Oct 2013 21:34:05 +0000 Subject: SF.net SVN: gar:[22178] csw/mgar/pkg/tk85/trunk Message-ID: Revision: 22178 http://gar.svn.sourceforge.net/gar/?rev=22178&view=rev Author: lblume Date: 2013-10-08 21:34:05 +0000 (Tue, 08 Oct 2013) Log Message: ----------- tk85/trunk: Fix for Xft detection Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tk85/trunk/files/0003-make-xft-use-pkgconfig.patch Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 20:33:40 UTC (rev 22177) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-08 21:34:05 UTC (rev 22178) @@ -21,6 +21,7 @@ PATCHFILES += 0001-disable-libsunmath.patch PATCHFILES += 0002-CFLAGS-should-be-at-the-end.patch +PATCHFILES += 0003-make-xft-use-pkgconfig.patch PACKAGES += CSWtk SPKG_DESC_CSWtk = GUI toolkit for tcl Added: csw/mgar/pkg/tk85/trunk/files/0003-make-xft-use-pkgconfig.patch =================================================================== --- csw/mgar/pkg/tk85/trunk/files/0003-make-xft-use-pkgconfig.patch (rev 0) +++ csw/mgar/pkg/tk85/trunk/files/0003-make-xft-use-pkgconfig.patch 2013-10-08 21:34:05 UTC (rev 22178) @@ -0,0 +1,13 @@ +--- a/unix/configure ++++ b/unix/configure +@@ -10548,8 +10548,8 @@ fi; + echo "${ECHO_T}$enable_xft" >&6 + else + found_xft="yes" +- XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no" +- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" ++ false || found_xft="no" ++ false || found_xft="no" + if test "$found_xft" = "no" ; then + found_xft=yes + XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" 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 Oct 8 23:54:34 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 21:54:34 +0000 Subject: SF.net SVN: gar:[22179] csw/mgar/pkg/lang-python Message-ID: Revision: 22179 http://gar.svn.sourceforge.net/gar/?rev=22179&view=rev Author: wahwah Date: 2013-10-08 21:54:34 +0000 (Tue, 08 Oct 2013) Log Message: ----------- py_pastedeploy: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/pastedeploy/trunk/Makefile csw/mgar/pkg/lang-python/pastedeploy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pastedeploy/ Modified: csw/mgar/pkg/lang-python/pastedeploy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pastedeploy/trunk/Makefile 2013-10-08 21:54:34 UTC (rev 22179) @@ -1,35 +1,15 @@ # $Id$ -NAME = python-dateutil -VERSION = 1.5 +NAME = PasteDeploy +VERSION = 1.5.0 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module -define BLURB - Dateutil offers functionality such as computing relative time deltas, - computing dates based on flexible recurrence rules, generic parsing of - dates, handling of tzfile(5) format files and computing of Easter - Sunday for various calendars. -endef +DESCRIPTION = Load, configure, and compose WSGI applications and servers -MASTER_SITES = http://labix.org/download/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://labix.org/$(NAME)/ -BUILD_DEP_PKGS = CSWpy-setuptools -PACKAGES = CSWpy-dateutil +VENDOR_URL = https://pypi.python.org/pypi/PasteDeploy +PACKAGES = CSWpy-pastedeploy -UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ - -TEST_SCRIPTS = dateutil - -LICENSE = LICENSE ARCHALL = 1 -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/dateutil/tz.py -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/dateutil/tz.py - include gar/category.mk - -test-dateutil: - (cd $(WORKSRC); python test.py) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/pastedeploy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pastedeploy/trunk/checksums 2013-10-08 21:54:34 UTC (rev 22179) @@ -1 +1 @@ -35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz +f1a068a0b680493b6eaff3dd7690690f PasteDeploy-1.5.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 9 00:00:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 22:00:09 +0000 Subject: SF.net SVN: gar:[22180] csw/mgar/pkg/lang-python/PasteDeploy/ Message-ID: Revision: 22180 http://gar.svn.sourceforge.net/gar/?rev=22180&view=rev Author: wahwah Date: 2013-10-08 22:00:09 +0000 (Tue, 08 Oct 2013) Log Message: ----------- PasteDeploy: Removing an old build recipe. Removed Paths: ------------- csw/mgar/pkg/lang-python/PasteDeploy/ 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 Oct 9 00:10:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 08 Oct 2013 22:10:17 +0000 Subject: SF.net SVN: gar:[22181] csw/mgar/pkg/lang-python/sqlalchemy/trunk Message-ID: Revision: 22181 http://gar.svn.sourceforge.net/gar/?rev=22181&view=rev Author: wahwah Date: 2013-10-08 22:10:16 +0000 (Tue, 08 Oct 2013) Log Message: ----------- lang-python/sqlalchemy/trunk: Version upgrade, dual Python version build Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums Modified: csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-08 22:00:09 UTC (rev 22180) +++ csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-08 22:10:16 UTC (rev 22181) @@ -6,18 +6,19 @@ # http://www.sqlalchemy.org/trac/ticket/1837 NAME = SQLAlchemy -VERSION = 0.8.0 +VERSION = 0.8.2 CATEGORIES = python PACKAGES = CSWpy-sqlalchemy DESCRIPTION = Python SQL toolkit and Object Relational Mapper VENDOR_URL = http://www.sqlalchemy.org/ -MASTER_SITES = $(PYPI_MIRROR) DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz LICENSE = LICENSE +RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-7-1-0 include gar/category.mk Modified: csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums 2013-10-08 22:00:09 UTC (rev 22180) +++ csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums 2013-10-08 22:10:16 UTC (rev 22181) @@ -1 +1 @@ -11cd07ca81fab78d53f2922b5fb187a3 SQLAlchemy-0.8.0.tar.gz +5a33fb43dea93468dbb2a6562ee80b54 SQLAlchemy-0.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 9 09:00:20 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Oct 2013 07:00:20 +0000 Subject: SF.net SVN: gar:[22182] csw/mgar/pkg/lang-python/mock/trunk/Makefile Message-ID: Revision: 22182 http://gar.svn.sourceforge.net/gar/?rev=22182&view=rev Author: wahwah Date: 2013-10-09 07:00:20 +0000 (Wed, 09 Oct 2013) Log Message: ----------- lang-python/mock/trunk: It's okay to enable tests here Modified Paths: -------------- csw/mgar/pkg/lang-python/mock/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mock/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mock/trunk/Makefile 2013-10-08 22:10:16 UTC (rev 22181) +++ csw/mgar/pkg/lang-python/mock/trunk/Makefile 2013-10-09 07:00:20 UTC (rev 22182) @@ -12,5 +12,4 @@ DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = https://pypi.python.org/pypi/mock/1.0.1 ARCHALL = 1 -TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 9 09:11:20 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Oct 2013 07:11:20 +0000 Subject: SF.net SVN: gar:[22183] csw/mgar/pkg/lang-python/coverage/trunk Message-ID: Revision: 22183 http://gar.svn.sourceforge.net/gar/?rev=22183&view=rev Author: wahwah Date: 2013-10-09 07:11:20 +0000 (Wed, 09 Oct 2013) Log Message: ----------- lang-python/coverage/trunk: Version upgrade Modified Paths: -------------- csw/mgar/pkg/lang-python/coverage/trunk/Makefile csw/mgar/pkg/lang-python/coverage/trunk/checksums Modified: csw/mgar/pkg/lang-python/coverage/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/coverage/trunk/Makefile 2013-10-09 07:00:20 UTC (rev 22182) +++ csw/mgar/pkg/lang-python/coverage/trunk/Makefile 2013-10-09 07:11:20 UTC (rev 22183) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = coverage -VERSION = 3.6 +VERSION = 3.7 CATEGORIES = python GARTYPE = v2 @@ -11,6 +11,11 @@ DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = https://pypi.python.org/pypi/coverage +RUNTIME_DEP_PKGS_CSWpy-coverage += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-coverage += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-coverage += CSWlibpython2-7-1-0 +CHECKPKG_OVERRIDES_CSWpy-coverage += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/coverage/html.py +CHECKPKG_OVERRIDES_CSWpy-coverage += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/coverage/html.py + include gar/category.mk Modified: csw/mgar/pkg/lang-python/coverage/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/coverage/trunk/checksums 2013-10-09 07:00:20 UTC (rev 22182) +++ csw/mgar/pkg/lang-python/coverage/trunk/checksums 2013-10-09 07:11:20 UTC (rev 22183) @@ -1 +1 @@ -67d4e393f4c6a5ffc18605409d2aa1ac coverage-3.6.tar.gz +055d82e6849d882ec6cf2ae1faca8e56 coverage-3.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 9 09:54:24 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 09 Oct 2013 07:54:24 +0000 Subject: SF.net SVN: gar:[22184] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 22184 http://gar.svn.sourceforge.net/gar/?rev=22184&view=rev Author: lblume Date: 2013-10-09 07:54:23 +0000 (Wed, 09 Oct 2013) Log Message: ----------- tcl85/trunk: Admit defeat, reinstate sunmath on x86; remove old patch files Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 07:11:20 UTC (rev 22183) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 07:54:23 UTC (rev 22184) @@ -20,16 +20,13 @@ REN_TCLSH = tclsh8.5 -#PATCHDIR = $(WORKDIR)/$(DISTNAME) -#PATCHFILES += 0001-Enable-SONAME-in-library.patch -#PATCHFILES += 0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch -#PATCHFILES += 0003_ld_lacks_LDFLAGS.patch -PATCHFILES += 0004-disable-libsunmath.patch - # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: # # # On Solaris 5.x i386 with the sunpro compiler we need to link # # with sunmath to get floating point rounding control +# +# I think it's not really needed on recent Solaris 10, but it also appears +# to be a pain to remove, so I'll just let it be. PACKAGES = CSWtcl SPKG_DESC_CSWtcl = Tcl programming language 8.5 @@ -47,9 +44,10 @@ PKGFILES_CSWlibtcl8-5 += $(libdir)/tcl8.5/.* # This dependency can not be tracked by checkpkg RUNTIME_DEP_PKGS_CSWlibtcl8-5 += CSWtcl8-tclmodules +RUNTIME_DEP_PKGS_CSWlibtcl8-5-i386 += CSWsunmath +RUNTIME_DEP_PKGS_CSWlibtcl8-5 += $(RUNTIME_DEP_PKGS_CSWlibtcl8-5-$(GARCH)) CHECKPKG_OVERRIDES_CSWlibtcl8-5 += surplus-dependency|CSWtcl8-tclmodules - # This is correct, the soname with *.so is really the one to use CHECKPKG_OVERRIDES_CSWlibtcl8-5 += soname-equals-filename Deleted: csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch 2013-10-09 07:11:20 UTC (rev 22183) +++ csw/mgar/pkg/tcl85/trunk/files/0001-Enable-SONAME-in-library.patch 2013-10-09 07:54:23 UTC (rev 22184) @@ -1,40 +0,0 @@ -From ceab3487bb09c08ca527ca41d94bea68f1370ac7 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 5 Sep 2012 15:55:32 +0200 -Subject: [PATCH] Enable SONAME in library - ---- - unix/Makefile.in | 4 +++- - unix/tcl.m4 | 1 + - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/unix/Makefile.in b/unix/Makefile.in -index a527bf0..3659916 100644 ---- a/unix/Makefile.in -+++ b/unix/Makefile.in -@@ -722,7 +722,9 @@ install-binaries: binaries - fi - @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) -+ @mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 -+ @ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) -+ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 - @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ - @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 3974753..cb31f50 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -1989,6 +1989,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - use_sunmath=no - ]) - ]) -+ TCL_SHLIB_LD_EXTRAS="-h \${TCL_LIB_FILE}.0" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" --- -1.7.10.3 - Deleted: csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2013-10-09 07:11:20 UTC (rev 22183) +++ csw/mgar/pkg/tcl85/trunk/files/0002-Fix-linking-issues-and-enable-building-on-Solaris-9-.patch 2013-10-09 07:54:23 UTC (rev 22184) @@ -1,62 +0,0 @@ -From bb82b6ee8a1ed4bd1f3c0df9656d9554a38d18b7 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 5 Sep 2012 11:44:36 -0500 -Subject: [PATCH] Fix linking issues and enable building on Solaris 9 and - earlier - ---- - unix/tcl.m4 | 9 +++++---- - 1 Datei ge?ndert, 5 Zeilen hinzugef?gt(+), 4 Zeilen entfernt(-) - -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index cb31f50..84a738c 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -1961,6 +1961,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - ], [ - do64bit_ok=yes - case $system in -+# Non functional check, m64/xarch depends on compiler not os version - SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) - CFLAGS="$CFLAGS -m64" - LDFLAGS="$LDFLAGS -m64";; -@@ -1979,7 +1980,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - AS_IF([test "$GCC" = yes],[use_sunmath=no],[ - arch=`isainfo` - AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) -- AS_IF([test "$arch" = "amd64 i386"], [ -+ AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ - AC_MSG_RESULT([yes]) - MATH_LIBS="-lsunmath $MATH_LIBS" - AC_CHECK_HEADER(sunmath.h) -@@ -2013,13 +2014,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - ], [ - AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) - case $system in -- SunOS-5.[[1-9]][[0-9]]*) -+ SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) - SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; - *) - SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; - esac - CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' - ]) - ;; - UNIX_SV* | UnixWare-5*) --- -1.7.11.3 - -diff --git a/unix/configure b/unix/configure -index 753f7c0..5810fc3 100755 ---- a/unix/configure -+++ b/unix/configure -@@ -8599,7 +8599,7 @@ else - arch=`isainfo` - echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 - echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 Deleted: csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch 2013-10-09 07:11:20 UTC (rev 22183) +++ csw/mgar/pkg/tcl85/trunk/files/0003_ld_lacks_LDFLAGS.patch 2013-10-09 07:54:23 UTC (rev 22184) @@ -1,12 +0,0 @@ -index d7bd53b..6c5d750 100755 ---- a/unix/configure -+++ b/unix/configure -@@ -8869,7 +8869,7 @@ fi - if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then - - LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${LDFLAGS} ${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' - if test "${SHLIB_SUFFIX}" = ".dll"; then - - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' Deleted: csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch 2013-10-09 07:11:20 UTC (rev 22183) +++ csw/mgar/pkg/tcl85/trunk/files/0004-disable-libsunmath.patch 2013-10-09 07:54:23 UTC (rev 22184) @@ -1,12 +0,0 @@ -index 6c5d750..3023fa5 100755 ---- a/unix/configure -+++ b/unix/configure -@@ -8492,7 +8492,7 @@ else - arch=`isainfo` - echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 - echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 -- if test "$arch" = "amd64 i386"; then -+ if test "$arch" = "xxx"; then - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 9 11:14:12 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 09 Oct 2013 09:14:12 +0000 Subject: SF.net SVN: gar:[22185] csw/mgar/pkg/tcl85/trunk Message-ID: Revision: 22185 http://gar.svn.sourceforge.net/gar/?rev=22185&view=rev Author: lblume Date: 2013-10-09 09:14:12 +0000 (Wed, 09 Oct 2013) Log Message: ----------- tcl85/trunk: Right, it was broken on S9, too Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tcl85/trunk/files/0001-libsunmath-needs-fix-on-S9.patch Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 07:54:23 UTC (rev 22184) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 09:14:12 UTC (rev 22185) @@ -18,6 +18,8 @@ VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms +PATCHFILES += 0001-libsunmath-needs-fix-on-S9.patch + REN_TCLSH = tclsh8.5 # The dependencies on the ISAs differ, here's from tcl-x.y.z/unix/tcl.m4: Added: csw/mgar/pkg/tcl85/trunk/files/0001-libsunmath-needs-fix-on-S9.patch =================================================================== --- csw/mgar/pkg/tcl85/trunk/files/0001-libsunmath-needs-fix-on-S9.patch (rev 0) +++ csw/mgar/pkg/tcl85/trunk/files/0001-libsunmath-needs-fix-on-S9.patch 2013-10-09 09:14:12 UTC (rev 22185) @@ -0,0 +1,12 @@ +index d7bd53b..9c592ea 100755 +--- a/unix/configure ++++ b/unix/configure +@@ -8492,7 +8492,7 @@ else + arch=`isainfo` + echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5 + echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6 +- if test "$arch" = "amd64 i386"; then ++ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then + + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Oct 9 16:55:50 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Oct 2013 14:55:50 +0000 Subject: SF.net SVN: gar:[22186] csw/mgar/pkg/lang-python/nose/trunk Message-ID: Revision: 22186 http://gar.svn.sourceforge.net/gar/?rev=22186&view=rev Author: wahwah Date: 2013-10-09 14:55:49 +0000 (Wed, 09 Oct 2013) Log Message: ----------- lang-python/nose/trunk: Version upgrade Modified Paths: -------------- csw/mgar/pkg/lang-python/nose/trunk/Makefile csw/mgar/pkg/lang-python/nose/trunk/checksums Modified: csw/mgar/pkg/lang-python/nose/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/Makefile 2013-10-09 09:14:12 UTC (rev 22185) +++ csw/mgar/pkg/lang-python/nose/trunk/Makefile 2013-10-09 14:55:49 UTC (rev 22186) @@ -1,7 +1,7 @@ # $Id$ NAME = nose -VERSION = 0.11.3 +VERSION = 1.3.0 CATEGORIES = python GARTYPE = v2 @@ -14,14 +14,10 @@ other common use cases. endef -SPKG_SOURCEURL = http://code.google.com/p/python-nose/ -GOOGLE_PROJECT = python-nose -MASTER_SITES = $(GOOGLE_MIRROR) +VENDOR_URL = https://github.com/nose-devs/nose DISTFILES = $(NAME)-$(VERSION).tar.gz -UPSTREAM_MASTER_SITES = http://code.google.com/p/python-nose/downloads/list PACKAGES = CSWpy-nose -CATALOGNAME = py_nose SPKG_DESC = $(DESCRIPTION) TEST_SCRIPTS = Modified: csw/mgar/pkg/lang-python/nose/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/checksums 2013-10-09 09:14:12 UTC (rev 22185) +++ csw/mgar/pkg/lang-python/nose/trunk/checksums 2013-10-09 14:55:49 UTC (rev 22186) @@ -1 +1 @@ -fbf6bc7b7c2bbb535d8ea9a931a1e65b nose-0.11.3.tar.gz +95d6d32b9d6b029c3c65674bd9e7eabe nose-1.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 9 20:45:49 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 09 Oct 2013 18:45:49 +0000 Subject: SF.net SVN: gar:[22187] csw/mgar/pkg/tcl85/trunk/Makefile Message-ID: Revision: 22187 http://gar.svn.sourceforge.net/gar/?rev=22187&view=rev Author: lblume Date: 2013-10-09 18:45:49 +0000 (Wed, 09 Oct 2013) Log Message: ----------- tcl85/trunk: One more hack to get that libsunmath to work Modified Paths: -------------- csw/mgar/pkg/tcl85/trunk/Makefile Modified: csw/mgar/pkg/tcl85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 14:55:49 UTC (rev 22186) +++ csw/mgar/pkg/tcl85/trunk/Makefile 2013-10-09 18:45:49 UTC (rev 22187) @@ -104,6 +104,9 @@ TEST_TARGET = test +# To help it find the libsunmath it so desperately needs +EXTRA_LD_OPTIONS = -L$(libdir) + 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 Thu Oct 10 00:22:09 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 09 Oct 2013 22:22:09 +0000 Subject: SF.net SVN: gar:[22188] csw/mgar/pkg/lang-python Message-ID: Revision: 22188 http://gar.svn.sourceforge.net/gar/?rev=22188&view=rev Author: wahwah Date: 2013-10-09 22:22:07 +0000 (Wed, 09 Oct 2013) Log Message: ----------- lang-python/webtest: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/webtest/trunk/Makefile csw/mgar/pkg/lang-python/webtest/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/webtest/ Modified: csw/mgar/pkg/lang-python/webtest/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/webtest/trunk/Makefile 2013-10-09 22:22:07 UTC (rev 22188) @@ -1,35 +1,36 @@ # $Id$ -NAME = python-dateutil -VERSION = 1.5 +NAME = WebTest +VERSION = 2.0.9 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module -define BLURB - Dateutil offers functionality such as computing relative time deltas, - computing dates based on flexible recurrence rules, generic parsing of - dates, handling of tzfile(5) format files and computing of Easter - Sunday for various calendars. -endef +DESCRIPTION = Helper to test WSGI applications -MASTER_SITES = http://labix.org/download/$(NAME)/ -DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://labix.org/$(NAME)/ -BUILD_DEP_PKGS = CSWpy-setuptools -PACKAGES = CSWpy-dateutil +DISTFILES = $(DISTNAME).zip +VENDOR_URL = https://pypi.python.org/pypi/WebTest +PACKAGES += CSWpy-webtest -UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ +BUILD_DEP_PKGS += CSWpy-coverage +BUILD_DEP_PKGS += CSWpy-cssselect +BUILD_DEP_PKGS += CSWpy-lxml +BUILD_DEP_PKGS += CSWpy-mock +BUILD_DEP_PKGS += CSWpy-nose +BUILD_DEP_PKGS += CSWpy-pyquery +BUILD_DEP_PKGS += CSWpy-unittest2 +DEP_PKGS += CSWpy-beautifulsoup4 +DEP_PKGS += CSWpy-ordereddict +DEP_PKGS += CSWpy-six +DEP_PKGS += CSWpy-waitress +DEP_PKGS += CSWpy-webob -TEST_SCRIPTS = dateutil - -LICENSE = LICENSE ARCHALL = 1 -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/dateutil/tz.py -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/dateutil/tz.py +TEST_SCRIPTS = +CHECKPKG_OVERRIDES_CSWpy-webtest += surplus-dependency|CSWpy-beautifulsoup4 +CHECKPKG_OVERRIDES_CSWpy-webtest += surplus-dependency|CSWpy-webob +CHECKPKG_OVERRIDES_CSWpy-webtest += surplus-dependency|CSWpy-waitress +CHECKPKG_OVERRIDES_CSWpy-webtest += surplus-dependency|CSWpy-six +CHECKPKG_OVERRIDES_CSWpy-webtest += surplus-dependency|CSWpy-ordereddict + include gar/category.mk - -test-dateutil: - (cd $(WORKSRC); python test.py) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/webtest/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/webtest/trunk/checksums 2013-10-09 22:22:07 UTC (rev 22188) @@ -1 +1 @@ -35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz +bf0a04fcf8b2cdcaa13b04324cefb53d WebTest-2.0.9.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 Oct 10 10:02:49 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Oct 2013 08:02:49 +0000 Subject: SF.net SVN: gar:[22189] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 22189 http://gar.svn.sourceforge.net/gar/?rev=22189&view=rev Author: dmichelsen Date: 2013-10-10 08:02:48 +0000 (Thu, 10 Oct 2013) Log Message: ----------- pigz/trunk: Update to 2.3.1 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 2013-10-09 22:22:07 UTC (rev 22188) +++ csw/mgar/pkg/pigz/trunk/Makefile 2013-10-10 08:02:48 UTC (rev 22189) @@ -1,5 +1,5 @@ NAME = pigz -VERSION = 2.3 +VERSION = 2.3.1 GARTYPE = v2 DESCRIPTION = A parallel implementation of gzip @@ -22,8 +22,6 @@ 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 2013-10-09 22:22:07 UTC (rev 22188) +++ csw/mgar/pkg/pigz/trunk/checksums 2013-10-10 08:02:48 UTC (rev 22189) @@ -1 +1 @@ -042e3322534f2c3d761736350cac303f pigz-2.3.tar.gz +e803f8bc0770c7a5e96dccb1d2dd2aab pigz-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 Thu Oct 10 11:27:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Oct 2013 09:27:54 +0000 Subject: SF.net SVN: gar:[22190] csw/mgar/pkg/gmake/trunk Message-ID: Revision: 22190 http://gar.svn.sourceforge.net/gar/?rev=22190&view=rev Author: dmichelsen Date: 2013-10-10 09:27:54 +0000 (Thu, 10 Oct 2013) Log Message: ----------- gmake/trunk: Update to 4.0, usem modulations for guile-enabled build Modified Paths: -------------- csw/mgar/pkg/gmake/trunk/Makefile csw/mgar/pkg/gmake/trunk/checksums Modified: csw/mgar/pkg/gmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/gmake/trunk/Makefile 2013-10-10 08:02:48 UTC (rev 22189) +++ csw/mgar/pkg/gmake/trunk/Makefile 2013-10-10 09:27:54 UTC (rev 22190) @@ -1,5 +1,5 @@ NAME = make -VERSION = 3.82 +VERSION = 4.0 GARTYPE = v2 DESCRIPTION = Controls generation of executables and other compile-related tasks @@ -13,29 +13,65 @@ endef MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += ftp://alpha.gnu.org/gnu/make/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 VENDOR_URL = http://www.gnu.org/software/make/ +EXTRA_MODULATORS += GUILE +MODULATIONS_GUILE = yes no + PACKAGES = CSWgmake SPKG_DESC_CSWgmake = GNU Make controls generation of executables and other compile-related tasks RUNTIME_DEP_PKGS_CSWgmake += CSWlibintl8 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --program-prefix=g - # These are hardcoded fallback pathes for include (see read.c): # "/usr/gnu/include", "/usr/local/include", "/usr/include" -CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake +CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake-noguile # These are just examples CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/share/info/make.info-1 CHECKPKG_OVERRIDES_CSWgmake += file-with-bad-content|/usr/local|root/opt/csw/share/info/make.info-2 +PACKAGES += CSWgmake-guile +SPKG_DESC_CSWgmake-guile = GNU Make with GUILE support +PKGFILES_CSWgmake-guile += $(bindir)/gmake-guile +RUNTIME_DEP_PKGS_CSWgmake-guile += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgmake-guile += CSWlibguile2-0-22 +# Needed, but unknown to checkpkg +RUNTIME_DEP_PKGS_CSWgmake-guile += CSWgmake +CHECKPKG_OVERRIDES_CSWgmake-guile += surplus-dependency|CSWgmake + +CHECKPKG_OVERRIDES_CSWgmake-guile += file-with-bad-content|/usr/local|root/opt/csw/bin/gmake-guile + +# Guile was compiled with GCC, so make sure to use same here +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-prefix=g + +CONFIGURE_ARGS_guile-yes += --with-guile +CONFIGURE_ARGS_guile-no += --without-guile +CONFIGURE_ARGS += $(CONFIGURE_ARGS_guile-$(GUILE)) + + MERGE_SCRIPTS_isa-default-guile-no = copy-all +MERGE_SCRIPTS_isa-default-guile-yes = copy-guile-only + +EXTRA_PAX_ARGS_isa-default-guile-no += -s ",\($(bindir)/gmake\),\1-noguile," + +ALTERNATIVES_CSWgmake = noguile +ALTERNATIVES_CSWgmake-guile = guile +ALTERNATIVE_noguile = $(bindir)/gmake gmake $(bindir)/gmake-noguile 100 +ALTERNATIVE_guile = $(bindir)/gmake gmake $(bindir)/gmake-guile 200 + include gar/category.mk -post-install-modulated: +post-install: ginstall -d $(DESTDIR)$(prefix)/gnu $(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);) @$(MAKECOOKIE) +merge-copy-guile-only: + ginstall -d $(PKGROOT)$(bindir) + ginstall $(INSTALLISADIR)$(bindir)/gmake $(PKGROOT)$(bindir)/gmake-guile + @$(MAKECOOKIE) Modified: csw/mgar/pkg/gmake/trunk/checksums =================================================================== --- csw/mgar/pkg/gmake/trunk/checksums 2013-10-10 08:02:48 UTC (rev 22189) +++ csw/mgar/pkg/gmake/trunk/checksums 2013-10-10 09:27:54 UTC (rev 22190) @@ -1 +1 @@ -1a11100f3c63fcf5753818e59d63088f make-3.82.tar.bz2 +571d470a7647b455e3af3f92d79f1c18 make-4.0.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 Oct 10 11:38:11 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 10 Oct 2013 09:38:11 +0000 Subject: SF.net SVN: gar:[22191] csw/mgar/pkg/rdesktop/trunk/Makefile Message-ID: Revision: 22191 http://gar.svn.sourceforge.net/gar/?rev=22191&view=rev Author: dmichelsen Date: 2013-10-10 09:38:10 +0000 (Thu, 10 Oct 2013) Log Message: ----------- rdesktop/trunk: Add comment Modified Paths: -------------- csw/mgar/pkg/rdesktop/trunk/Makefile Modified: csw/mgar/pkg/rdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdesktop/trunk/Makefile 2013-10-10 09:27:54 UTC (rev 22190) +++ csw/mgar/pkg/rdesktop/trunk/Makefile 2013-10-10 09:38:10 UTC (rev 22191) @@ -28,6 +28,7 @@ RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibgssglue0 +# If these are not added directly here auth against win7 won't work, haven't figured out why yet RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibgssapi-krb5-2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Oct 10 13:13:14 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 10 Oct 2013 11:13:14 +0000 Subject: SF.net SVN: gar:[22192] csw/mgar/pkg/tk85/trunk/Makefile Message-ID: Revision: 22192 http://gar.svn.sourceforge.net/gar/?rev=22192&view=rev Author: lblume Date: 2013-10-10 11:13:13 +0000 (Thu, 10 Oct 2013) Log Message: ----------- tk85/trunk: Reenable sunmath Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-10 09:38:10 UTC (rev 22191) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-10 11:13:13 UTC (rev 22192) @@ -12,14 +12,13 @@ DISTNAME = $(NAME)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz -# libsunmath support on Solaris 9 i386 is broken PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 VENDOR_URL = http://www.tcl.tk/ LICENSE = license.terms -PATCHFILES += 0001-disable-libsunmath.patch +#PATCHFILES += 0001-disable-libsunmath.patch PATCHFILES += 0002-CFLAGS-should-be-at-the-end.patch PATCHFILES += 0003-make-xft-use-pkgconfig.patch @@ -28,7 +27,6 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5 - RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Oct 10 20:46:26 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 10 Oct 2013 18:46:26 +0000 Subject: SF.net SVN: gar:[22193] csw/mgar/pkg/tk85/trunk/Makefile Message-ID: Revision: 22193 http://gar.svn.sourceforge.net/gar/?rev=22193&view=rev Author: lblume Date: 2013-10-10 18:46:25 +0000 (Thu, 10 Oct 2013) Log Message: ----------- tk85/trunk: So sunmath seems to really *not* be actually needed... Modified Paths: -------------- csw/mgar/pkg/tk85/trunk/Makefile Modified: csw/mgar/pkg/tk85/trunk/Makefile =================================================================== --- csw/mgar/pkg/tk85/trunk/Makefile 2013-10-10 11:13:13 UTC (rev 22192) +++ csw/mgar/pkg/tk85/trunk/Makefile 2013-10-10 18:46:25 UTC (rev 22193) @@ -27,8 +27,8 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath -RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH)) +#RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath +#RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH)) PACKAGES += CSWlibtk8-5 SPKG_DESC_CSWlibtk8-5 = GUI toolkit library for tcl, libtk8.5.so 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 Oct 10 21:08:17 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Oct 2013 19:08:17 +0000 Subject: SF.net SVN: gar:[22194] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 22194 http://gar.svn.sourceforge.net/gar/?rev=22194&view=rev Author: wahwah Date: 2013-10-10 19:08:17 +0000 (Thu, 10 Oct 2013) Log Message: ----------- gardev/trunk: webtest is used in testing the new code Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2013-10-10 18:46:25 UTC (rev 22193) +++ csw/mgar/pkg/gardev/trunk/Makefile 2013-10-10 19:08:17 UTC (rev 22194) @@ -43,6 +43,7 @@ RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-pyelftools RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-sqlobject RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-unittest2 +RUNTIME_DEP_PKGS_CSWgar-dev += CSWpy-webtest RUNTIME_DEP_PKGS_CSWgar-dev += CSWpython RUNTIME_DEP_PKGS_CSWgar-dev += CSWsvn RUNTIME_DEP_PKGS_CSWgar-dev += CSWwget 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 Oct 11 00:14:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 10 Oct 2013 22:14:24 +0000 Subject: SF.net SVN: gar:[22195] csw/mgar/pkg/gardev/trunk/Makefile Message-ID: Revision: 22195 http://gar.svn.sourceforge.net/gar/?rev=22195&view=rev Author: wahwah Date: 2013-10-10 22:14:23 +0000 (Thu, 10 Oct 2013) Log Message: ----------- gardev/trunk: Building on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/gardev/trunk/Makefile Modified: csw/mgar/pkg/gardev/trunk/Makefile =================================================================== --- csw/mgar/pkg/gardev/trunk/Makefile 2013-10-10 19:08:17 UTC (rev 22194) +++ csw/mgar/pkg/gardev/trunk/Makefile 2013-10-10 22:14:23 UTC (rev 22195) @@ -18,6 +18,11 @@ SPKG_DESC_CSWgar-dev = $(DESCRIPTION) OBSOLETED_BY_CSWgar-dev = CSWgardevel +# This is a metapackage, ARCH=all, so only 1 build platform necessary. +# We're building on Solaris 0 to maintain the infrastructure operational on +# Solaris 9. +PACKAGING_PLATFORMS = solaris9-i386 + # git and netcat are required if a GAR repo is tracking a git repo instead # of upstream tarballs. svn is required for commiting gar recipes RUNTIME_DEP_PKGS_CSWgar-dev = CSWgmake 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 Oct 11 11:33:31 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 11 Oct 2013 09:33:31 +0000 Subject: SF.net SVN: gar:[22196] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 22196 http://gar.svn.sourceforge.net/gar/?rev=22196&view=rev Author: dmichelsen Date: 2013-10-11 09:33:31 +0000 (Fri, 11 Oct 2013) Log Message: ----------- gcc4/trunk: Tiny fix with alternatives prio (not used anywhere ATM IIRC) Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-10 22:14:23 UTC (rev 22195) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2013-10-11 09:33:31 UTC (rev 22196) @@ -102,7 +102,7 @@ # Used multiple times in package definitions JAVA_LIB_VERSION = 14 -ALTERNATIVES_PRIO = 470 +ALTERNATIVES_PRIO = 481 PACKAGES = $(PKG_BASENAME)core SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Oct 11 12:08:31 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 11 Oct 2013 10:08:31 +0000 Subject: SF.net SVN: gar:[22197] csw/mgar/pkg/mysql5/branches Message-ID: Revision: 22197 http://gar.svn.sourceforge.net/gar/?rev=22197&view=rev Author: lblume Date: 2013-10-11 10:08:30 +0000 (Fri, 11 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: clean up of old unused bits in the recipe; update & clarify the readme; remove the old changelog Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-11 10:08:30 UTC (rev 22197) @@ -65,14 +65,8 @@ OPT_FLAGS_SOS-64 = -xO3 OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL)) - INITSMF = $(sysconfdir)/init\.d/csw$(NAME) -# Existing databases are in this location -localstatedir = /var$(BUILD_PREFIX)/$(NAME) -# To avoid file conflicts -# datadir = $(prefix)/share/mysql/$(BASE_VERSION) - MYSQL_LIB_VER = 18 MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) @@ -85,11 +79,10 @@ CSWmysql-dev_programs += mysql_config PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(bindir)/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* -PKGFILES_CSWmysql-dev += /opt/csw/include/mysql PATCHFILES += 0003-I-HATE-CMAKE.patch PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch @@ -131,11 +124,8 @@ PKGFILES_CSW$(NAME)client = $(bindir) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) -# 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 +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(bindir)/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(sbindir)/$(bin_name)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0 @@ -153,11 +143,8 @@ CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += 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) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0 @@ -188,12 +175,11 @@ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl DISTFILES += quick_start-csw -DISTFILES += README.CSW -DISTFILES += ChangeLog DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup DISTFILES += map.mysql +DISTFILES += README.CSW # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) @@ -204,12 +190,17 @@ # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) CMAKE_ARGS += -DINSTALL_LAYOUT=RPM -CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) +CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin +CMAKE_ARGS += -DINSTALL_DOCDIR=$(subst $(prefix)/,,$(docdir))/$(NAME) +CMAKE_ARGS += -DINSTALL_DOCREADMEDIR=$(subst $(prefix)/,,$(docdir))/$(NAME) +CMAKE_ARGS += -DINSTALL_INFODIR=$(subst $(prefix)/,,$(infodir))/$(NAME) +CMAKE_ARGS += -DINSTALL_MYSQLSHAREDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME) +CMAKE_ARGS += -DINSTALL_SUPPORTFILESDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)/support-files CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system @@ -224,7 +215,7 @@ CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON -CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison +CMAKE_ARGS += -DBISON_EXECUTABLE=$(prefix)/bin/bison # The line below come from the official MySQL build configuration CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" @@ -249,11 +240,11 @@ endif -USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup +USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup -PROTOTYPE_MODIFIERS = dbdir -PROTOTYPE_FILES_dbdir = $(localstatedir) -PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir)/$(NAME) +PROTOTYPE_USER_dbdir = mysql PROTOTYPE_GROUP_dbdir = mysql PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles @@ -332,7 +323,7 @@ post-configure-modulated: gsed \ -e 's+ at prefix@+$(prefix)+g' \ - -e 's+ at localstatedir@+$(localstatedir)+g' \ + -e 's+ at localstatedir@+$(localstatedir)/$(NAME)+g' \ -e 's+ at sysconfdir@+$(sysconfdir)+g' \ -e 's+ at bindir@+$(bindir)+g' \ -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ @@ -350,15 +341,8 @@ @$(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/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-$(BASE_VERSION).CSW \ - $(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW - # The quick_start-csw file is almost the same as postinstall. - # [ -d $(PKGROOT)$(datadir)/mysql ] + ginstall -m 755 -d $(PKGROOT)$(localstatedir)/$(NAME) + ginstall -m 755 -d $(PKGROOT)$(datadir)/doc/$(NAME) ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0001-Use-libc-not-libcrypt.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,28 +0,0 @@ -From 6925aace1b489a5ffb0265c7fdc7edc3def7d995 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 26 Jul 2010 08:03:17 +0200 -Subject: [PATCH] Use libc not libcrypt - ---- - configure.in | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 7374723..1c181c7 100644 ---- a/configure.in -+++ b/configure.in -@@ -860,7 +860,10 @@ AC_SEARCH_LIBS(setsockopt, socket) - # This may get things to compile even if bind-8 is installed - AC_SEARCH_LIBS(bind, bind) - # Check if crypt() exists in libc or libcrypt, sets LIBS if needed --AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) -+## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) -+# For crypt() on Solaris use libc, not libcrypt -+AC_CHECK_LIB(c, crypt) -+AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) - # See if we need a library for address lookup. - AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) - --- -1.7.1 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-cast-user_info-pw_gid-to-gid_t.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,27 +0,0 @@ -From 8536f5925a96634950decd8779b2c6a60d183134 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Wed, 16 Sep 2009 01:29:57 +0100 -Subject: [PATCH 2/4] cast user_info->pw_gid to gid_t - ---- - sql/mysqld.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/sql/mysqld.cc b/sql/mysqld.cc -index 592ae3e..695fbb9 100644 ---- a/sql/mysqld.cc -+++ b/sql/mysqld.cc -@@ -1436,7 +1436,9 @@ static void set_user(const char *user, struct passwd *user_info_arg) - output a specific message to help the user resolve this problem. - */ - calling_initgroups= TRUE; -- initgroups((char*) user, user_info_arg->pw_gid); -+/* Solaris patch */ -+/* initgroups((char*) user, user_info->pw_gid); */ -+ initgroups((char*) user,(gid_t) user_info->pw_gid); - calling_initgroups= FALSE; - #endif - if (setgid(user_info_arg->pw_gid) == -1) --- -1.6.3.2 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0002-stop-cmake-from-messing-with-cflags.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,29 +0,0 @@ -From 813fc9123c5b461d1f06b56c7398f28d56a3f1dd Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Sun, 9 Oct 2011 09:25:28 +0200 -Subject: [PATCH] stop cmake from messing with cflags - ---- - cmake/os/SunOS.cmake | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake -index 3d2b4b8..300d20e 100644 ---- a/cmake/os/SunOS.cmake -+++ b/cmake/os/SunOS.cmake -@@ -84,12 +84,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4 - } ") - CHECK_C_SOURCE_COMPILES(${SOURCE} HAVE_SPARC32_TICK) - IF(NOT HAVE_SPARC32_TICK) -- SET(CMAKE_REQUIRED_FLAGS "-mcpu=v9") - CHECK_C_SOURCE_COMPILES(${SOURCE} HAVE_SPARC32_TICK_WITH_V9) - SET(CMAKE_REQUIRED_FLAGS) -- IF(HAVE_SPARC32_TICK_WITH_V9) -- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=v9") -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=v9") -- ENDIF() - ENDIF() - ENDIF() --- -1.7.6.1 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-OpenCSW-perl-for-tests.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,22 +0,0 @@ -From bd9a3ff419f5a614d584aa6156a512e69f470e0f Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= -Date: Wed, 16 Sep 2009 01:36:09 +0100 -Subject: [PATCH 3/4] OpenCSW perl for tests - ---- - mysql-test/mysql-test-run.pl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl -index f60701b..cd9f843 100755 ---- a/mysql-test/mysql-test-run.pl -+++ b/mysql-test/mysql-test-run.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/opt/csw/bin/perl - # -*- cperl -*- - - # --- -1.6.3.2 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-looking-for-ps-use-basename-0.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,48 +0,0 @@ -From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Wed, 28 Sep 2011 23:26:47 +0200 -Subject: [PATCH] looking for ps, use `basename $0` - -Upstream bug filed: -http://bugs.mysql.com/bug.php?id=62567 - ---- - configure.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.in b/configure.in -index cfae77d..8e6dd43 100644 ---- a/configure.in -+++ b/configure.in -@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps) - AC_MSG_CHECKING("how to check if pid exists") - PS=$ac_cv_path_PS - # Linux style --if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null -+if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null - then - FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" - # Solaris --elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null -+elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null - then - FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null -+elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null - then - FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" - # SysV style --elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null -+elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null - then - FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null" - # Do anybody use this? --elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null -+elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null - then - FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" - else --- -1.7.6.1 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,81 +0,0 @@ -From b46fd72320554ec86a256a859006a04de8e68564 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 12 Aug 2010 12:00:14 +0200 -Subject: [PATCH] /var/opt/csw/mysql51 for datadir in my-*.cnf - ---- - support-files/my-huge.cnf.sh | 2 ++ - support-files/my-innodb-heavy-4G.cnf.sh | 2 ++ - support-files/my-large.cnf.sh | 2 ++ - support-files/my-medium.cnf.sh | 2 ++ - support-files/my-small.cnf.sh | 2 ++ - 5 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh -index 17a7ddb..51c0531 100644 ---- a/support-files/my-huge.cnf.sh -+++ b/support-files/my-huge.cnf.sh -@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh -index e9390a5..fb62231 100644 ---- a/support-files/my-innodb-heavy-4G.cnf.sh -+++ b/support-files/my-innodb-heavy-4G.cnf.sh -@@ -39,6 +39,8 @@ socket = @MYSQL_UNIX_ADDR@ - # The MySQL server - # - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - - # generic configuration options - port = @MYSQL_TCP_PORT@ -diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh -index bbdfdb3..f3dec5d 100644 ---- a/support-files/my-large.cnf.sh -+++ b/support-files/my-large.cnf.sh -@@ -23,6 +23,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh -index 88113d0..18f6405 100644 ---- a/support-files/my-medium.cnf.sh -+++ b/support-files/my-medium.cnf.sh -@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking -diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh -index 3bfa08d..a20fdc5 100644 ---- a/support-files/my-small.cnf.sh -+++ b/support-files/my-small.cnf.sh -@@ -24,6 +24,8 @@ socket = @MYSQL_UNIX_ADDR@ - - # The MySQL server - [mysqld] -+basedir = /opt/csw/mysql51 -+datadir = /var/opt/csw/mysql51 - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ - skip-locking --- -1.7.1 - Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0005_my_vsnprintf-t_fails_bug_62572.patch 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,14 +0,0 @@ ---- a/unittest/mysys/my_vsnprintf-t.c.original lun. mars 25 14:14:58 2013 -+++ b/unittest/mysys/my_vsnprintf-t.c jeu. mai 16 15:35:30 2013 -@@ -31,7 +31,11 @@ - - int main(void) - { -+#if defined (__GNUC__) - plan(58); -+#else -+ plan(57); -+#endif - - test1("Constant string", - "Constant string"); Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2013-10-11 10:08:30 UTC (rev 22197) @@ -15,8 +15,9 @@ MYSQL_HOME="/var${prefix}/mysql5" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 -DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf" +DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf MYSQLD_USER="mysql" +MYSQLD_GROUP="mysql" # Provide the default data directory MYSQLD_DATADIR="${MYSQL_HOME}" DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" @@ -32,7 +33,7 @@ fi if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -49,7 +50,7 @@ # Create the database directory and set the permissions if needed if [ ! -d "$MYSQLD_DATADIR" ] ; then mkdir -p $MYSQLD_DATADIR - chown -R mysql:mysql $MYSQLD_DATADIR + chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR chmod 0700 $MYSQLD_DATADIR fi # @@ -72,7 +73,7 @@ # Fix permissions on the data directory, since mysql_install_db was run as # root. -chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR +chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then @@ -83,10 +84,9 @@ # Ending message echo echo "### The following messages are from $0." -echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "See ${prefix}/share/doc/mysql5/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." +echo " These messages are from mysql_install_db." exit 0 Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ChangeLog 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,37 +0,0 @@ -2009-11-05 Maciej Blizi?ski - - * Makefile: Reworked the package from ground up, using GAR. - -2007-06-17 Alex Moore - - * Version 5.1: MySQL 5.1 is still in beta. This package is released - for your testing only. - -2007-06-03 Alex Moore - - * Startup script: This update fixes a startup script problem that - caused the script to not work when --datadir is not the default. This - update also adds amd64 mysqld and client libraries. - -2006-12-29 Alex Moore - - * csw.conf: This update adds support for csw.conf. See the following - url for details. http://www.blastwave.org/standards/csw.conf.html The - daemon specific name for this package is mysql5. - *** IMPORTANT *** - If you are using mysql5rc; please move your options to my.cnf and - eliminate mysql5rc. A future release will remove mysql5rc. my.cnf is - more flexible and any new or missing options will not be added to - mysql5rc. quick_start-csw is changed with this release to Not write - mysql5rc. Options for --basedir and --datadir are included in the - default my.cnf files. - *** END OF IMPORTANT *** - -2006-04-16 Alex Moore - - * quick_start-csw: This update fixes some problems with - quick_start-csw and svc-mysql5. I have also corrected some issues - when using a database directory that is not /opt/csw/mysql5/var 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. 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 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,12 +1,18 @@ -[[needs review]] -MySQL 5.5 OpenCSW package -======================= + MySQL 5.5 OpenCSW package + ========================= -* Read only /opt/csw support - - data in /var/opt/csw - - configuration in /etc/opt/csw -* The prefix is /opt/csw, and all the binaries are now in - /opt/csw, so that the standard PATH setting allows to use them -* The startup script is now in /etc/opt/csw/init.d -* SMF support is handled by cswclassutils + * Read only /opt/csw support + - data in /var/opt/csw/mysql5 + - configuration in /etc/opt/csw/my.cnf + * The prefix is /opt/csw, and all the client binaries are now in + /opt/csw, so that the standard PATH setting allows to use them. + * The server binaries are in /opt/csw/libexec for the 32 bit one and + /opt/csw/libexec/0amd64|sparcv9] for the 64 bit one. + * The startup script is now in /etc/opt/csw/init.d + * SMF support is handled by cswclassutils + Running MySQL is handled by the cswmysql5 service in Solaris >= 10, + and the traditional /etc/init.d/cswmysql5 in Solaris 9. + * The preferred architecture can be set using mysql5_arch= in csw.conf: + the default is to use the kernel's. + Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-10-11 10:08:30 UTC (rev 22197) @@ -61,11 +61,6 @@ INITSMF = $(sysconfdir)/init\.d/csw$(NAME) -# Existing databases are in this location -localstatedir = /var$(BUILD_PREFIX)/$(NAME) -# To avoid file conflicts -# datadir = $(prefix)/share/mysql/$(BASE_VERSION) - MYSQL_LIB_VER = 18 MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) @@ -78,11 +73,10 @@ CSWmysql-dev_programs += mysql_config PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(bindir)/$(bin_name)) +PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* -PKGFILES_CSWmysql-dev += /opt/csw/include/mysql PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -114,13 +108,14 @@ client_programs += perror client_programs += replace +ISAEXEC_CSW$(NAME)client = 1 PACKAGES += CSW$(NAME)client SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries PKGFILES_CSW$(NAME)client = $(bindir) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(call baseisadirs,$(bindir),$(bin_name))) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)) -PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(bindir)/$(bin_name)) +PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(sbindir)/$(bin_name)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry @@ -154,28 +149,33 @@ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl DISTFILES += quick_start-csw -DISTFILES += README.CSW -DISTFILES += ChangeLog DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup DISTFILES += map.mysql +DISTFILES += README.CSW # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWcmake BUILD_DEP_PKGS += CSWbison +BUILD_DEP_PKGS += CSWlibwrap-dev # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) CMAKE_ARGS += "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" CMAKE_ARGS += -DINSTALL_LAYOUT=RPM -CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) +CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir)/$(NAME) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin +CMAKE_ARGS += -DINSTALL_DOCDIR=$(subst $(prefix)/,,$(docdir))/$(NAME) +CMAKE_ARGS += -DINSTALL_DOCREADMEDIR=$(subst $(prefix)/,,$(docdir))/$(NAME) +CMAKE_ARGS += -DINSTALL_INFODIR=$(subst $(prefix)/,,$(infodir))/$(NAME) +CMAKE_ARGS += -DINSTALL_MYSQLSHAREDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME) +CMAKE_ARGS += -DINSTALL_SUPPORTFILESDIR=$(subst $(prefix)/,,$(sharedstatedir))/$(NAME)/support-files CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system @@ -192,7 +192,7 @@ CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON -CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison +CMAKE_ARGS += -DBISON_EXECUTABLE=$(prefix)/bin/bison # The line below come from the official MySQL build configuration CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" @@ -227,11 +227,11 @@ CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" -USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup +USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup -PROTOTYPE_MODIFIERS = dbdir -PROTOTYPE_FILES_dbdir = $(localstatedir) -PROTOTYPE_USER_dbdir = mysql +PROTOTYPE_MODIFIERS = dbdir +PROTOTYPE_FILES_dbdir = $(localstatedir)/$(NAME) +PROTOTYPE_USER_dbdir = mysql PROTOTYPE_GROUP_dbdir = mysql PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles @@ -304,7 +304,7 @@ post-configure-modulated: gsed \ -e 's+ at prefix@+$(prefix)+g' \ - -e 's+ at localstatedir@+$(localstatedir)+g' \ + -e 's+ at localstatedir@+$(localstatedir)/$(NAME)+g' \ -e 's+ at sysconfdir@+$(sysconfdir)+g' \ -e 's+ at bindir@+$(bindir)+g' \ -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ @@ -324,15 +324,8 @@ @$(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/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-$(BASE_VERSION).CSW \ - $(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW - # The quick_start-csw file is almost the same as postinstall. - # [ -d $(PKGROOT)$(datadir)/mysql ] + ginstall -m 755 -d $(PKGROOT)$(localstatedir)/$(NAME) + ginstall -m 755 -d $(PKGROOT)$(datadir)/doc/$(NAME) ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall 2013-10-11 10:08:30 UTC (rev 22197) @@ -15,8 +15,9 @@ MYSQL_HOME="/var${prefix}/mysql5" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 -DEFAULTS_FILE="${prefix}/share/mysql/my-small.cnf" +DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf MYSQLD_USER="mysql" +MYSQLD_GROUP="mysql" # Provide the default data directory MYSQLD_DATADIR="${MYSQL_HOME}" DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" @@ -32,7 +33,7 @@ fi if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -49,7 +50,7 @@ # Create the database directory and set the permissions if needed if [ ! -d "$MYSQLD_DATADIR" ] ; then mkdir -p $MYSQLD_DATADIR - chown -R mysql:mysql $MYSQLD_DATADIR + chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR chmod 0700 $MYSQLD_DATADIR fi # @@ -72,7 +73,7 @@ # Fix permissions on the data directory, since mysql_install_db was run as # root. -chown -R ${MYSQLD_USER}:mysql $MYSQLD_DATADIR +chown -R ${MYSQLD_USER}:${MYSQLD_GROUP} $MYSQLD_DATADIR # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then @@ -83,10 +84,9 @@ # Ending message echo echo "### The following messages are from $0." -echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "See ${prefix}/share/doc/mysql5/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." +echo " These messages are from mysql_install_db." exit 0 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW 2013-10-11 09:33:31 UTC (rev 22196) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/README.CSW 2013-10-11 10:08:30 UTC (rev 22197) @@ -1,12 +1,18 @@ -[[needs review]] -MySQL 5.5 OpenCSW package -======================= + MySQL 5.5 OpenCSW package + ========================= -* Read only /opt/csw support - - data in /var/opt/csw - - configuration in /etc/opt/csw -* The prefix is /opt/csw, and all the binaries are now in - /opt/csw, so that the standard PATH setting allows to use them -* The startup script is now in /etc/opt/csw/init.d -* SMF support is handled by cswclassutils + * Read only /opt/csw support + - data in /var/opt/csw/mysql5 + - configuration in /etc/opt/csw/my.cnf + * The prefix is /opt/csw, and all the client binaries are now in + /opt/csw, so that the standard PATH setting allows to use them. + * The server binaries are in /opt/csw/libexec for the 32 bit one and + /opt/csw/libexec/0amd64|sparcv9] for the 64 bit one. + * The startup script is now in /etc/opt/csw/init.d + * SMF support is handled by cswclassutils + Running MySQL is handled by the cswmysql5 service in Solaris >= 10, + and the traditional /etc/init.d/cswmysql5 in Solaris 9. + * The preferred architecture can be set using mysql5_arch= in csw.conf: + the default is to use the kernel's. + 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 Oct 12 21:50:56 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 12 Oct 2013 19:50:56 +0000 Subject: SF.net SVN: gar:[22198] csw/mgar/gar/v2/lib/python/dependency_checks.py Message-ID: Revision: 22198 http://gar.svn.sourceforge.net/gar/?rev=22198&view=rev Author: chninkel Date: 2013-10-12 19:50:53 +0000 (Sat, 12 Oct 2013) Log Message: ----------- gar/v2: handle the special case of amd64 binaries in Solaris 9 packages for the version dependencies check Modified Paths: -------------- csw/mgar/gar/v2/lib/python/dependency_checks.py Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-10-11 10:08:30 UTC (rev 22197) +++ csw/mgar/gar/v2/lib/python/dependency_checks.py 2013-10-12 19:50:53 UTC (rev 22198) @@ -1,4 +1,4 @@ -# $Id$ +# $Id: dependency_checks.py 21908 2013-09-11 19:48:35Z chninkel $ import checkpkg_lib import os.path @@ -293,6 +293,13 @@ pass osrel = pkg_data['basic_stats']['parsed_basename']['osrel'] + + if (osrel == u'SunOS5.9' and + binary_info['path'].endswith('/amd64/' + binary_info['base_name'])): + # amd64 binaries in Solaris 5.9 packages were in fact compiled under + # Solaris 5.10 so we have a special case here + osrel = u'SunOS5.10' + for version_dep in binary_elf_info['version needed']: soname = version_dep['soname'] if not soname in ALLOWED_VERSION_DEPENDENCIES: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Oct 12 23:50:13 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 12 Oct 2013 21:50:13 +0000 Subject: SF.net SVN: gar:[22199] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 22199 http://gar.svn.sourceforge.net/gar/?rev=22199&view=rev Author: lblume Date: 2013-10-12 21:50:11 +0000 (Sat, 12 Oct 2013) Log Message: ----------- krb5-lib/trunk: Add C99 parameters; use external BDB48 Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-12 19:50:53 UTC (rev 22198) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2013-10-12 21:50:11 UTC (rev 22199) @@ -22,7 +22,7 @@ GARCOMPILER = GCC4 -BUILD_DEP_PKGS = CSWtcl +BUILD_DEP_PKGS += CSWtcl PACKAGES += CSWlibkrb5-dev SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries @@ -93,12 +93,13 @@ SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib -LICENSE = doc/copyright.texinfo +LICENSE = doc/copyright.rst EXTRA_LD_OPTIONS += -M $(abspath mapfile) -EXTRA_CPPFLAGS += -D__EXTENSIONS__ -EXTRA_LDFLAGS += -L$(libdir) -lintl +EXTRA_CFLAGS += -std=gnu99 +EXTRA_CPPFLAGS += -D__EXTENSIONS__ +EXTRA_LDFLAGS += -L$(libdir) -lintl CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure @@ -112,9 +113,14 @@ CONFIGURE_ARGS += --disable-static --disable-profiled CONFIGURE_ARGS += --without-ldap CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-system-db # To pick the right tclConfig.sh CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += DB_HEADER=$(prefix)/bdb48/include/db_185.h +CONFIGURE_ARGS += DB_LIB="-L$(prefix)/bdb48/$(MM_LIBDIR) -R$(prefix)/bdb48/$(MM_LIBDIR)" +SKIPTEST = 1 + BUILD_SCRIPTS = $(WORKSRC)/src/Makefile TEST_SCRIPTS = $(WORKSRC)/src/Makefile 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 Oct 13 15:07:19 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 13 Oct 2013 13:07:19 +0000 Subject: SF.net SVN: gar:[22200] csw/mgar/pkg Message-ID: Revision: 22200 http://gar.svn.sourceforge.net/gar/?rev=22200&view=rev Author: chninkel Date: 2013-10-13 13:07:16 +0000 (Sun, 13 Oct 2013) Log Message: ----------- jq/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/jq/ csw/mgar/pkg/jq/Makefile csw/mgar/pkg/jq/branches/ csw/mgar/pkg/jq/tags/ csw/mgar/pkg/jq/trunk/ csw/mgar/pkg/jq/trunk/Makefile csw/mgar/pkg/jq/trunk/checksums csw/mgar/pkg/jq/trunk/files/ Added: csw/mgar/pkg/jq/Makefile =================================================================== --- csw/mgar/pkg/jq/Makefile (rev 0) +++ csw/mgar/pkg/jq/Makefile 2013-10-13 13:07:16 UTC (rev 22200) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jq/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:07:16 UTC (rev 22200) @@ -0,0 +1,36 @@ +##################################################################### +# OpenCSW build recipe for jq +# +# Copyright 2013 Yann Rouillard +# All rights reserved. Use is subject to license terms. +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + +NAME = jq +VERSION = 1.3 +GARTYPE = v2 + +DESCRIPTION = A lightweight and flexible command-line JSON processor. +define BLURB + jq is like sed for JSON data, you can use it to slice and filter and map + and transform structured data with the same ease that sed, awk, grep and + friends let you play with text. +endef + +###### Upstream and opencsw files information ####### + +MASTER_SITES = http://stedolan.github.io/jq/download/source/ +DISTFILES = $(DISTNAME).tar.gz + +##### Build and installation information ##### + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/jq/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jq/trunk/checksums =================================================================== --- csw/mgar/pkg/jq/trunk/checksums (rev 0) +++ csw/mgar/pkg/jq/trunk/checksums 2013-10-13 13:07:16 UTC (rev 22200) @@ -0,0 +1 @@ +26081b05d22525eca5cbdd8f9f4db17d jq-1.3.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 Oct 13 15:23:44 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 13 Oct 2013 13:23:44 +0000 Subject: SF.net SVN: gar:[22201] csw/mgar/pkg/jq/trunk/Makefile Message-ID: Revision: 22201 http://gar.svn.sourceforge.net/gar/?rev=22201&view=rev Author: chninkel Date: 2013-10-13 13:23:44 +0000 (Sun, 13 Oct 2013) Log Message: ----------- jq/trunk: switch to gcc compiler Modified Paths: -------------- csw/mgar/pkg/jq/trunk/Makefile Modified: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:07:16 UTC (rev 22200) +++ csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:23:44 UTC (rev 22201) @@ -30,6 +30,8 @@ ##### Build and installation information ##### +GARCOMPILER = GNU + 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 chninkel at users.sourceforge.net Sun Oct 13 15:24:09 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 13 Oct 2013 13:24:09 +0000 Subject: SF.net SVN: gar:[22202] csw/mgar/pkg/jq/trunk Message-ID: Revision: 22202 http://gar.svn.sourceforge.net/gar/?rev=22202&view=rev Author: chninkel Date: 2013-10-13 13:24:08 +0000 (Sun, 13 Oct 2013) Log Message: ----------- jq/trunk: remove usage in valgrind in test suite Modified Paths: -------------- csw/mgar/pkg/jq/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch Modified: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:23:44 UTC (rev 22201) +++ csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:24:08 UTC (rev 22202) @@ -28,6 +28,10 @@ MASTER_SITES = http://stedolan.github.io/jq/download/source/ DISTFILES = $(DISTNAME).tar.gz +# The jq test suite uses valgrind to check for memory leaks +# but we don't have it on Solaris +PATCHFILES += 0001-remove-valgrind-usage-in-tests.patch + ##### Build and installation information ##### GARCOMPILER = GNU Added: csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch =================================================================== --- csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch (rev 0) +++ csw/mgar/pkg/jq/trunk/files/0001-remove-valgrind-usage-in-tests.patch 2013-10-13 13:24:08 UTC (rev 22202) @@ -0,0 +1,22 @@ +From 6844b92414bfc868430485a64606411f8db5d6af Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Sun, 13 Oct 2013 17:19:50 +0200 +Subject: [PATCH] remove valgrind usage in tests + +--- + tests/run | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/run b/tests/run +index a4b5b32..42ecf58 100755 +--- a/tests/run ++++ b/tests/run +@@ -1,3 +1,3 @@ + #!/bin/sh + +-cat $@ | valgrind --error-exitcode=1 -q --leak-check=full ./jq --run-tests +\ No newline at end of file ++cat $@ | ./jq --run-tests +-- +1.8.3.4 + 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 Oct 13 15:32:45 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 13 Oct 2013 13:32:45 +0000 Subject: SF.net SVN: gar:[22203] csw/mgar/pkg/jq/trunk/Makefile Message-ID: Revision: 22203 http://gar.svn.sourceforge.net/gar/?rev=22203&view=rev Author: chninkel Date: 2013-10-13 13:32:44 +0000 (Sun, 13 Oct 2013) Log Message: ----------- jq/trunk: disable test suite Modified Paths: -------------- csw/mgar/pkg/jq/trunk/Makefile Modified: csw/mgar/pkg/jq/trunk/Makefile =================================================================== --- csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:24:08 UTC (rev 22202) +++ csw/mgar/pkg/jq/trunk/Makefile 2013-10-13 13:32:44 UTC (rev 22203) @@ -38,5 +38,7 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_SCRIPTS = + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 13 19:06:02 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 13 Oct 2013 17:06:02 +0000 Subject: SF.net SVN: gar:[22204] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 22204 http://gar.svn.sourceforge.net/gar/?rev=22204&view=rev Author: lblume Date: 2013-10-13 17:06:00 +0000 (Sun, 13 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Replace the Studio optimization level by the one found in S11 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-xO4-fix.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-13 13:32:44 UTC (rev 22203) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-13 17:06:00 UTC (rev 22204) @@ -8,8 +8,9 @@ # # About building MySQL with cmake: # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide - - +# +# http://dev.mysql.com/doc/refman/5.5/en/source-configuration-options.html +# PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 @@ -40,8 +41,6 @@ LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" endif - - DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -51,26 +50,38 @@ (Structured Query Language) database server. endef -# Those options follow those of the official builds -EXTRA_CFLAGS-sparc = -Xa -xstrconst -EXTRA_CFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -xlibmil -xlibmopt -EXTRA_CXXFLAGS-sparc = -noex -EXTRA_CXXFLAGS-i386 = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt -EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GARCH)) -g -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm +# Those options follow those of the Solaris 11 build +# https://java.net/projects/solaris-userland/sources/gate/show/components/mysql-5-1?rev=1502 +EXTRA_CXXFLAGS_64 += -features=no%except -# The official build used -xO2 on 32 bit x86, -xO3 for 64 bit -# Use that for all builds -OPT_FLAGS_SOS-32 = -xO2 -OPT_FLAGS_SOS-64 = -xO3 -OPT_FLAGS_SOS = $(OPT_FLAGS_SOS-$(MEMORYMODEL)) +# Required at -xO4 +# https://java.net/projects/solaris-userland/sources/gate/content/make-rules/shared-macros.mk?rev=1505` +EXTRA_CFLAGS_sparc += -Qoption cg -xregs=no%appl +EXTRA_CFLAGS_i386 += -xregs=no%frameptr +EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) + +# The Solaris 11 build uses -xO4 by default +OPT_FLAGS_SOS_32 = -xO4 +OPT_FLAGS_SOS_64 = -xO4 +OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s +OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s +OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) + INITSMF = $(sysconfdir)/init\.d/csw$(NAME) MYSQL_LIB_VER = 18 MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) +PATCHFILES += 0003-I-HATE-CMAKE.patch +PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch +PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch +# https://java.net/projects/solaris-userland/sources/gate/content/components/mysql-5-1/patches/xO4_optimization.patch?rev=1502 +PATCHFILES += 0004-xO4-fix.patch + +PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) @@ -83,11 +94,7 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(sbindir)/$(bin_name)) PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* -PATCHFILES += 0003-I-HATE-CMAKE.patch -PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch -PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch -PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-xO4-fix.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-xO4-fix.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0004-xO4-fix.patch 2013-10-13 17:06:00 UTC (rev 22204) @@ -0,0 +1,11 @@ +index fbb5d00..09a54d2 100644 +--- a/sql/sql_select.cc ++++ b/sql/sql_select.cc +@@ -102,6 +102,7 @@ static bool find_best(JOIN *join,table_map rest_tables,uint index, + double record_count,double read_time); + static uint cache_record_length(JOIN *join,uint index); + static double prev_record_reads(JOIN *join, uint idx, table_map found_ref); ++#pragma opt 2 (prev_record_reads) + static bool get_best_combination(JOIN *join); + static store_key *get_store_key(THD *thd, + KEYUSE *keyuse, table_map used_tables, 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 Oct 13 21:38:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 13 Oct 2013 19:38:49 +0000 Subject: SF.net SVN: gar:[22205] csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Message-ID: Revision: 22205 http://gar.svn.sourceforge.net/gar/?rev=22205&view=rev Author: wahwah Date: 2013-10-13 19:38:49 +0000 (Sun, 13 Oct 2013) Log Message: ----------- lang-python/virtualenv/trunk: Setuptools is necessary for virtualenv to work Modified Paths: -------------- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile Modified: csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2013-10-13 17:06:00 UTC (rev 22204) +++ csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile 2013-10-13 19:38:49 UTC (rev 22205) @@ -19,7 +19,9 @@ LICENSE = PKG-INFO BUILD_DEP_PKGS += CSWpy-mock DEP_PKGS = CSWpython-dev +DEP_PKGS = CSWpy-setuptools # /usr/share references are fine, these are docstrings. CHECKPKG_OVERRIDES_CSWpy-virtualenv += file-with-bad-content CHECKPKG_OVERRIDES_CSWpy-virtualenv += surplus-dependency|CSWpython-dev +CHECKPKG_OVERRIDES_CSWpy-virtualenv += surplus-dependency|CSWpy-setuptools include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Oct 13 23:26:04 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 13 Oct 2013 21:26:04 +0000 Subject: SF.net SVN: gar:[22206] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22206 http://gar.svn.sourceforge.net/gar/?rev=22206&view=rev Author: lblume Date: 2013-10-13 21:26:02 +0000 (Sun, 13 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Studio 12.0 does not like workaround for 7030022, and it was only needed for 12.1 and 12.2 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 2013-10-13 19:38:49 UTC (rev 22205) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-13 21:26:02 UTC (rev 22206) @@ -56,7 +56,7 @@ # Required at -xO4 # https://java.net/projects/solaris-userland/sources/gate/content/make-rules/shared-macros.mk?rev=1505` -EXTRA_CFLAGS_sparc += -Qoption cg -xregs=no%appl +EXTRA_CFLAGS_sparc += -xregs=no%appl EXTRA_CFLAGS_i386 += -xregs=no%frameptr EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Oct 13 23:44:24 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 13 Oct 2013 22:44:24 +0100 Subject: [csw-devel] SF.net SVN: gar:[22143] csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile In-Reply-To: References: Message-ID: 2013/10/6 Peter FELECAN > > > Log Message: > > ----------- > > lang-python/virtualenv/trunk: Dual Python version. > > [...] > > The package in unstable is already dual. It was released on August 27. You're right. http://buildfarm.opencsw.org/pkgdb/srv4/cbb6ae5f49d68b51f3c84d085d2f460f/files/ I was processing these packages in bulk, for some reason I thought this package wasn't dual yet. Maybe I just missed it. I noticed today that virtualenv requires setuptools, so I added the dep today. From dmichelsen at users.sourceforge.net Mon Oct 14 14:30:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Oct 2013 12:30:58 +0000 Subject: SF.net SVN: gar:[22207] csw/mgar/pkg/lang-python/twisted/trunk Message-ID: Revision: 22207 http://gar.svn.sourceforge.net/gar/?rev=22207&view=rev Author: dmichelsen Date: 2013-10-14 12:30:57 +0000 (Mon, 14 Oct 2013) Log Message: ----------- lang-python/twisted/trunk: Update to 13.1.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile csw/mgar/pkg/lang-python/twisted/trunk/checksums Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2013-10-13 21:26:02 UTC (rev 22206) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2013-10-14 12:30:57 UTC (rev 22207) @@ -2,10 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = twisted -MAJ_VERSION = 12.2 -PATCHLEVEL = 0 -VERSION = $(MAJ_VERSION).$(PATCHLEVEL) +NAME = Twisted +VERSION = 13.1.0 CATEGORIES = python GARTYPE = v2 @@ -15,30 +13,31 @@ mail servers, and more. endef -PYPI_PROJECT = Twisted MASTER_SITES += $(PYPI_MIRROR) -DISTNAME = $(PYPI_PROJECT)-$(VERSION) DISTFILES += $(DISTNAME).tar.bz2 -# TEST_SCRIPTS = +# For /usr/include/sys/socket.h to make msghdr.msg_control available +EXTRA_CPPFLAGS += -D_XPG4_2 + LICENSE = LICENSE PACKAGES += CSWpy-twisted SPKG_DESC_CSWpy-twisted = An event-driven networking engine RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface +RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibgcc-s1 OBSOLETED_BY_CSWpy-twisted = CSWtwisted -ARCHALL_CSWtwisted = 1 - -# CSWtwisted is now empty, so we need to tell checkpkg that it really needs to -# depend on these two packages. -CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpy-twisted -CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/tap/ftp.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/unix.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/openssh_compat/factory.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/twisted/scripts/tap2deb.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/unix.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/unix.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/conch/openssh_compat/factory.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/conch/openssh_compat/factory.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/twisted/tap/ftp.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/twisted/tap/ftp.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/twisted/scripts/tap2deb.py +CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/twisted/scripts/tap2deb.py + include gar/category.mk Modified: csw/mgar/pkg/lang-python/twisted/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/checksums 2013-10-13 21:26:02 UTC (rev 22206) +++ csw/mgar/pkg/lang-python/twisted/trunk/checksums 2013-10-14 12:30:57 UTC (rev 22207) @@ -1 +1 @@ -9a321b904d01efd695079f8484b37861 Twisted-12.2.0.tar.bz2 +5609c91ed465f5a7da48d30a0e7b6960 Twisted-13.1.0.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 Oct 14 14:42:44 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Oct 2013 12:42:44 +0000 Subject: SF.net SVN: gar:[22208] csw/mgar/pkg/lang-python/twisted/trunk/Makefile Message-ID: Revision: 22208 http://gar.svn.sourceforge.net/gar/?rev=22208&view=rev Author: dmichelsen Date: 2013-10-14 12:42:44 +0000 (Mon, 14 Oct 2013) Log Message: ----------- lang-python/twisted/trunk: Add comment Modified Paths: -------------- csw/mgar/pkg/lang-python/twisted/trunk/Makefile Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2013-10-14 12:30:57 UTC (rev 22207) +++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2013-10-14 12:42:44 UTC (rev 22208) @@ -16,7 +16,9 @@ MASTER_SITES += $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.bz2 -# For /usr/include/sys/socket.h to make msghdr.msg_control available +# For /usr/include/sys/socket.h to make msghdr.msg_control available. +# Add definition until this is fixed: +# https://twistedmatrix.com/trac/ticket/6787 EXTRA_CPPFLAGS += -D_XPG4_2 LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Oct 14 15:42:35 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Oct 2013 13:42:35 +0000 Subject: SF.net SVN: gar:[22209] csw/mgar/gar/v2/bin/chkdbcat Message-ID: Revision: 22209 http://gar.svn.sourceforge.net/gar/?rev=22209&view=rev Author: wahwah Date: 2013-10-14 13:42:28 +0000 (Mon, 14 Oct 2013) Log Message: ----------- chkdbcat: Making it executable Modified Paths: -------------- csw/mgar/gar/v2/bin/chkdbcat Property Changed: ---------------- csw/mgar/gar/v2/bin/chkdbcat Property changes on: csw/mgar/gar/v2/bin/chkdbcat ___________________________________________________________________ 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 Mon Oct 14 15:42:49 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Oct 2013 13:42:49 +0000 Subject: SF.net SVN: gar:[22210] csw/mgar/gar/v2 Message-ID: Revision: 22210 http://gar.svn.sourceforge.net/gar/?rev=22210&view=rev Author: wahwah Date: 2013-10-14 13:42:49 +0000 (Mon, 14 Oct 2013) Log Message: ----------- chkdbcat: Small (whitespace) changes Modified Paths: -------------- csw/mgar/gar/v2/bin/chkdbcat csw/mgar/gar/v2/lib/python/chkdbcat.py Modified: csw/mgar/gar/v2/bin/chkdbcat =================================================================== --- csw/mgar/gar/v2/bin/chkdbcat 2013-10-14 13:42:28 UTC (rev 22209) +++ csw/mgar/gar/v2/bin/chkdbcat 2013-10-14 13:42:49 UTC (rev 22210) @@ -46,7 +46,7 @@ print("Database Catalog {0} {2} {1}: FAILED".format(args.catalog_release, args.arch, args.os_release)) print("chkcat output") print checker.stderr - + exit(0) if success else exit(1) if __name__ == '__main__': Modified: csw/mgar/gar/v2/lib/python/chkdbcat.py =================================================================== --- csw/mgar/gar/v2/lib/python/chkdbcat.py 2013-10-14 13:42:28 UTC (rev 22209) +++ csw/mgar/gar/v2/lib/python/chkdbcat.py 2013-10-14 13:42:49 UTC (rev 22210) @@ -115,7 +115,7 @@ """Set time stamp for a given catrel, arch, and osrel. If date is an instance of datetime, the value obtained by - calling isoformat() will be stored. + calling isoformat() will be stored. If date is an instance of str, it has to be a date in iso format. @@ -144,7 +144,7 @@ # Mapping of key name to list index with optional transformation. # Used by __list_to_dict_generator() - __list_to_dict_translation = ( + __list_to_dict_translation = ( ('pkg', 0), ('version', 1), ('spkg', 2), @@ -205,7 +205,6 @@ . . . ] - Output is a list of dictionaries: [ @@ -310,7 +309,7 @@ logging.debug("Remove tmp directory %s" % (self.tmpdir,)) shutil.rmtree(self.tmpdir) self.tmpdir = None - + def __get_notification_address(self, pkginfo): """Returns the address where the notification will be sent to. @@ -322,7 +321,7 @@ if pkginfo['uploadby'] is not None and pkginfo['uploadby'] != "web": return pkginfo['uploadby']+'@opencsw.org' else: - return RestClient().GetMaintainerByMd5(pkginfo['md5'])['maintainer_email'] + return RestClient().GetMaintainerByMd5(pkginfo['md5'])['maintainer_email'] def notify(self, date, addr, pkginfo): """Notification. @@ -402,7 +401,7 @@ addr=self.__get_notification_address(np) notifications.setdefault(addr,{ 'lastsuccessful': lastsuccessful }) notifications[addr].setdefault('newpkgs', []).append(np) - + for n in notifications: self.notify(notifications[n]['lastsuccessful'], n, notifications[n]['newpkgs']) 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 Oct 14 16:44:48 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 14 Oct 2013 14:44:48 +0000 Subject: SF.net SVN: gar:[22212] csw/mgar/gar/v2/lib/python Message-ID: Revision: 22212 http://gar.svn.sourceforge.net/gar/?rev=22212&view=rev Author: cgrzemba Date: 2013-10-14 14:44:48 +0000 (Mon, 14 Oct 2013) Log Message: ----------- add find_obsolete_pkgs.py, extend interface of safe_remove_package.py Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Added Paths: ----------- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Added: csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py (rev 0) +++ csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2013-10-14 14:44:48 UTC (rev 22212) @@ -0,0 +1,185 @@ +#!/opt/csw/bin/python -t -O + +''' Compare two different catalog releases and show: + - Which packages need rebuilding (so they don't depend on the _stub any more) + - Which _stub packages can be removed + - Which packages can declare incompatibility on the old packages, so that the old packages can be removed + + set PYTHONPATH=/path/to/.buildsys/v2 + alternatively can used: sys.path.append('/path/to/.buildsys/v2') + + ToDO: + - read the sub hint from catalog + * if stub has consumer -> rebuild + * if stub has no consumer and the stub is present in the old/"from" catalog -> remove + * if stub has no consumer and the stub does not yet present in the old/"from" catalog -> keep +''' + +import optparse +import pprint +import gdbm +import logging +import sys +import os +import subprocess +from collections import namedtuple +import re +import cjson + +from lib.python import rest +from lib.python import common_constants +from lib.python import configuration +from lib.python.safe_remove_package import RevDeps + +logging.basicConfig(format='%(asctime)s %(levelname)s:%(message)s') +logger = logging.getLogger(__name__) + +oldcatrel = '' +newcatrel = '' +datadir=configuration.CHECKPKG_DIR % os.environ +# fn_revdep = os.path.join(datadir,'RevDeps_%s_%s_%s.json') +fn_cat = os.path.join(datadir,'catalog_%s_%s_%s.json') +fn_removelst = 'PkgsToRemoveFrom_%s_%s_%s.lst' +fn_rebuildlst = 'PkgsToRebuildFrom_%s_%s_%s.lst' +revdeplst = {} + +CatSubSet = namedtuple('CatSubSet','catalogname md5_sum version dependlist') + +class CompCatalog(object): + + def __init__(self,name,arch,osrel): + self.rest_client = rest.RestClient() + self.catrel = name + self.arch = arch + self.osrel = osrel + + def __getCat(self, name,arch,osrel): + ''' get dependcy list from catalog, read cached list if available ''' + catlst = {} + if os.path.exists(fn_cat % (name,osrel,arch)): + logger.info('CompCatalog::getCat: use cached data: %s' % (fn_cat % (name,osrel,arch))) + with open(fn_cat % (name,osrel,arch), "r") as fd: + catlst = cjson.decode(fd.read()) + else: + cat = self.rest_client.GetCatalog(name,arch,osrel) + for pkg in cat: + try: + pkgitems = self.rest_client.GetPkgstatsByMd5(pkg['md5_sum']) + pkgdeplst = [ i[0] for i in pkgitems['depends']] + catlst[pkgitems['basic_stats']['pkgname']] = CatSubSet(pkg['catalogname'],pkg['md5_sum'],pkg['version'],pkgdeplst) + except Exception as inst: + logger.error("CompCatalog::getPkgStat: %s %s %s" , type(inst),pkg['catalogname'],pkg['md5_sum']) + with open(fn_cat % (name,osrel,arch), "w") as fd: + fd.write(cjson.encode(catlst)) + logger.info('CompCatalog::getCat: write cache file: %s' % (fn_cat % (name,osrel,arch))) + return catlst + + def getCatalog(self): + return self.__getCat(self.catrel,self.arch,self.osrel) + +def processCat(catrel,arch,osrel): + revdeplst = {} + + logger.info("processCat: -> %s %s %s" % (catrel, arch, osrel)) + cc = CompCatalog(catrel,arch,osrel) + catlst = cc.getCatalog() + logger.info("processCat: iterate on %s" % (catrel)) + + ''' build reverse dependency list ''' + rd = RevDeps() + for p in catlst.keys(): + revdeplst[p] = rd.RevDepsByPkg(catrel,arch,osrel,p) + + logger.info("processCat: <- %s %s %s" % (catrel, arch, osrel)) + return catlst, revdeplst + +def main(): + parser = optparse.OptionParser() + parser.add_option("--debug", dest="debug", action="store_true") + parser.add_option("--verbose", dest="verbose", action="store_true") + parser.add_option("--to-catalog-release", dest="newcatalog", default='kiel', + help='set name of catalog to fetch', metavar = 'catalogname') + parser.add_option("--from-catalog-release", dest="oldcatalog", default='dublin', + help='set name of previous (older) catalog to fetch', metavar = 'old catalogname') + parser.add_option("--os-arch", dest="arch", default='i386', + help='set name of architecture (sparc|i386) to fetch', metavar = 'OS Architecture') + parser.add_option("--os-release", dest="osrel", default='SunOS5.10', + help='set os release to fetch (SunOS5.10|SunOS5.11)', metavar = 'OS Release') + options, args = parser.parse_args() + opterror = False + if options.verbose: + logger.setLevel(logging.INFO) + if options.debug: + logger.setLevel(logging.DEBUG) + if options.newcatalog in common_constants.DEFAULT_CATALOG_RELEASES: + newcatrel = options.newcatalog + else: + logger.error('unknown catalog: %s',options.newcatalog) + opterror = True + if options.oldcatalog in common_constants.DEFAULT_CATALOG_RELEASES: + oldcatrel = options.oldcatalog + else: + logger.error('unknown catalog: %s',options.newcatalog) + opterror = True + if options.arch in common_constants.PHYSICAL_ARCHITECTURES: + arch = options.arch + else: + logger.error('unknown architecture: %s',options.arch) + opterror = True + if options.osrel in common_constants.OS_RELS: + osrel = options.osrel + else: + logger.error('unknown OS Release: %s',options.osrel) + opterror = True + if opterror: + sys.exit(1) + + newcatlst, newrevdeplst = processCat(newcatrel,arch,osrel) + oldcatlst, oldrevdeplst = processCat(oldcatrel,arch,osrel) + + to_remove_candidates = [] + rebuildlst = [] + logger.debug(' process dependecies in %s' % newcatrel) + for p in newrevdeplst.keys(): + ''' check stub packages ''' + catalogname = CatSubSet(*newcatlst[p]).catalogname + if catalogname.endswith("_stub"): + if not newrevdeplst[p]: + to_remove_candidates.append(p) + logger.debug("{0}({1}) has no consumer".format(p,catalogname)) + else: + for dp in newrevdeplst[p]: + dpkg = dp[1] + if dpkg not in rebuildlst and not CatSubSet(*newcatlst[dpkg]).catalogname.endswith("_stub"): + rebuildlst.append(dpkg) + logger.info(" REBUILD: {3}\n\t\t\tthese still use {0} ({1}) in {2}\n" + .format(p,CatSubSet(*newcatlst[p]).catalogname,newcatrel, + [ dp[1] for dp in newrevdeplst[p]])) + reallyremovelst = [] + logger.debug(' process dependecies in %s' % newcatrel) + + for p in to_remove_candidates: + if p in oldrevdeplst: # this package is already a _stub in oldcatalog -> drop + reallyremovelst.append(p) + logger.info(" DROP : %s from %s" % (p,newcatrel)) + else: + logger.info(" KEEP : {0} not a _stub package in {1}".format(p,oldcatrel)) + + print ('write %s' % (fn_removelst % (newcatrel,osrel,arch))) + rmcnt = 0 + with open(fn_removelst % (newcatrel,osrel,arch), "w") as fd: + for rp in reallyremovelst: + fd.write(CatSubSet(*newcatlst[rp]).catalogname+'\n') + rmcnt = rmcnt + 1 + logger.info("packages to remove: %d" % rmcnt) + print ('write %s' % (fn_rebuildlst % (newcatrel,osrel,arch))) + rbcnt = 0 + with open(fn_rebuildlst % (newcatrel,osrel,arch), "w") as fd: + for rp in rebuildlst: + fd.write(CatSubSet(*newcatlst[rp]).catalogname+'\n') + rbcnt = rbcnt + 1 + logger.info("packages to rebuild: %d" % rbcnt) + + +if __name__ == '__main__': + main() Property changes on: csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-10-14 14:42:06 UTC (rev 22211) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2013-10-14 14:44:48 UTC (rev 22212) @@ -21,6 +21,8 @@ import cjson import urllib2 +from lib.python import configuration + USAGE = """%prog --os-releases=SunOS5.10,SunOS5.11 -c A practical usage example - let's say we have a list of packages to remove in @@ -42,6 +44,9 @@ UNSTABLE = "unstable" EVERY_N_DOTS = 100 +datadir = configuration.CHECKPKG_DIR % os.environ +fn_revdeps = os.path.join(datadir,'revdeps-%s-%s-%s.json') +fn_pkgstatsdb = os.path.join(datadir,"pkgstats") class Error(Exception): """A generic error.""" @@ -49,18 +54,24 @@ class DataError(Exception): """Wrong data encountered.""" + class RevDeps(object): + ''' + returns a list of [md5_sum,pkgname] + in the moment not used, perhaps later usefull: + RevDepsSet = namedtuple('RevDepsSet','md5_sum pkgname') + ''' def __init__(self): self.cached_catalogs = {} self.rest_client = rest.RestClient() - self.cp = rest.CachedPkgstats("pkgstats") + self.cp = rest.CachedPkgstats(fn_pkgstatsdb) def MakeRevIndex(self, catrel, arch, osrel, quiet=False): key = (catrel, arch, osrel) if key in self.cached_catalogs: return - fn = "revdeps-%s-%s-%s.json" % key + fn = fn_revdeps % key if os.path.exists(fn): with open(fn, "r") as fd: self.cached_catalogs[key] = cjson.decode(fd.read()) @@ -88,7 +99,7 @@ with open(fn, "w") as fd: fd.write(cjson.encode(self.cached_catalogs[key])) - def RevDeps(self, catrel, arch, osrel, md5_sum): + def RevDepsByMD5(self, catrel, arch, osrel, md5_sum): self.MakeRevIndex(catrel, arch, osrel) pkg = self.cp.GetPkgstats(md5_sum) pkgname = pkg["basic_stats"]["pkgname"] @@ -98,6 +109,13 @@ else: return [] + def RevDepsByPkg(self, catrel, arch, osrel, pkgname): + self.MakeRevIndex(catrel, arch, osrel) + key = (catrel, arch, osrel) + if pkgname in self.cached_catalogs[key]: + return self.cached_catalogs[key][pkgname] + else: + return [] class PackageRemover(object): @@ -143,9 +161,9 @@ if pkg_simple: found_anywhere = True md5 = pkg_simple["md5_sum"] - pkg = rd.cp.GetPkgstats(md5) + # pkg = rd.cp.GetPkgstats(md5) key = UNSTABLE, arch, osrel - cat_rev_deps = rd.RevDeps(UNSTABLE, arch, osrel, md5) + cat_rev_deps = rd.RevDepsByMD5(UNSTABLE, arch, osrel, md5) if cat_rev_deps: rev_deps[key] = cat_rev_deps to_remove.append((UNSTABLE, arch, osrel, md5)) @@ -168,7 +186,7 @@ def main(): parser = optparse.OptionParser(USAGE) - parser.add_option("-c", "--catalogname", dest="catalogname") + parser.add_option("-c", "--catalogname", dest="catalogname", help='the name of the package in catalog') parser.add_option("--os-releases", dest="os_releases", help=("Comma separated OS releases, e.g. " "SunOS5.9,SunOS5.10")) @@ -181,7 +199,10 @@ if options.debug: debug_level = logging.DEBUG logging.basicConfig(level=debug_level) - os_relases = None + if not options.catalogname: + logging.error('option catalogname required \n%s',USAGE) + sys.exit(1) + os_releases = common_constants.OS_RELS if options.os_releases: os_releases = options.os_releases.split(",") pr = PackageRemover() 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 Oct 14 17:35:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Oct 2013 15:35:33 +0000 Subject: SF.net SVN: gar:[22213] csw/mgar/pkg/lang-python/zope-interface/trunk Message-ID: Revision: 22213 http://gar.svn.sourceforge.net/gar/?rev=22213&view=rev Author: dmichelsen Date: 2013-10-14 15:35:32 +0000 (Mon, 14 Oct 2013) Log Message: ----------- lang-python/zope-interface/trunk: Update to 4.0.5 Modified Paths: -------------- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile csw/mgar/pkg/lang-python/zope-interface/trunk/checksums Modified: csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2013-10-14 14:44:48 UTC (rev 22212) +++ csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile 2013-10-14 15:35:32 UTC (rev 22213) @@ -3,17 +3,28 @@ # $Id$ NAME = zope.interface -VERSION = 3.6.1 +VERSION = 4.0.5 CATEGORIES = python GARTYPE = v2 -RUNTIME_DEP_PKGS_CSWpy-zope-interface += CSWlibpython2-6-1-0 -LICENSE = LICENSE.txt + DESCRIPTION = Implementation of object interfaces in Python define BLURB endef -SPKG_SOURCEURL = http://pypi.python.org/pypi/zope.interface -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).zip + +VENDOR_URL = http://pypi.python.org/pypi/zope.interface +LICENSE = LICENSE.txt + PACKAGES = CSWpy-zope-interface -CONFIGURE_ARGS = $(DIRPATHS) +SPKG_DESC_CSWpy-zope-interface = Implementation of object interfaces in Python +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpy-zope-interface += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-zope-interface += CSWlibpython2-7-1-0 +RUNTIME_DEP_PKGS_CSWpy-zope-interface += CSWlibgcc-s1 + +# For the Python 2.7 modulation the wrong Python is chosen +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/lang-python/zope-interface/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/zope-interface/trunk/checksums 2013-10-14 14:44:48 UTC (rev 22212) +++ csw/mgar/pkg/lang-python/zope-interface/trunk/checksums 2013-10-14 15:35:32 UTC (rev 22213) @@ -1 +1 @@ -7a895181b8d10be4a7e9a3afa13cd3be zope.interface-3.6.1.tar.gz +caf26025ae1b02da124a58340e423dfe zope.interface-4.0.5.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Oct 14 16:42:06 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 14 Oct 2013 14:42:06 +0000 Subject: SF.net SVN: gar:[22211] csw/mgar/pkg/libdvdread/trunk Message-ID: Revision: 22211 http://gar.svn.sourceforge.net/gar/?rev=22211&view=rev Author: pfelecan Date: 2013-10-14 14:42:06 +0000 (Mon, 14 Oct 2013) Log Message: ----------- libdvdread/trunk: changed upstream source Modified Paths: -------------- csw/mgar/pkg/libdvdread/trunk/Makefile csw/mgar/pkg/libdvdread/trunk/checksums Modified: csw/mgar/pkg/libdvdread/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdread/trunk/Makefile 2013-10-14 13:42:49 UTC (rev 22210) +++ csw/mgar/pkg/libdvdread/trunk/Makefile 2013-10-14 14:42:06 UTC (rev 22211) @@ -11,8 +11,12 @@ encrypted sections of a DVD. endef -MASTER_SITES = http://dvdnav.mplayerhq.hu/releases/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +GITHUB_USER = microe +GITHUB_REFERENCE= 3762e09 +MASTER_SITES = $(GITHUB_MIRROR) +VENDOR_URL = http://dvdnav.mplayerhq.hu/ +DISTNAME = $(GITHUB_USER)-$(NAME)-$(GITHUB_REFERENCE) +DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libdvdread/trunk/checksums =================================================================== --- csw/mgar/pkg/libdvdread/trunk/checksums 2013-10-14 13:42:49 UTC (rev 22210) +++ csw/mgar/pkg/libdvdread/trunk/checksums 2013-10-14 14:42:06 UTC (rev 22211) @@ -1 +1 @@ -ab7a19d3ab1a437ae754ef477d6231a4 libdvdread-4.2.0.tar.bz2 +f2da26f98edf2d273378fa56d454652b libdvdread-4.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 Mon Oct 14 18:05:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 14 Oct 2013 16:05:12 +0000 Subject: SF.net SVN: gar:[22214] csw/mgar/pkg/buildbot/trunk Message-ID: Revision: 22214 http://gar.svn.sourceforge.net/gar/?rev=22214&view=rev Author: dmichelsen Date: 2013-10-14 16:05:10 +0000 (Mon, 14 Oct 2013) Log Message: ----------- buildbot/trunk: Update to 0.8.8 Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile csw/mgar/pkg/buildbot/trunk/checksums Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-14 15:35:32 UTC (rev 22213) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-14 16:05:10 UTC (rev 22214) @@ -3,8 +3,7 @@ # $Id$ NAME = buildbot -VERSION = 0.7.12 -PATCHLEVEL = +VERSION = 0.8.8 CATEGORIES = python GARTYPE = v2 @@ -23,42 +22,25 @@ easier to improve. endef -MASTER_SITES = $(SF_MIRROR) +MASTER_SITES = $(PYPI_MIRROR) PATCHFILES = buildbot-tail.patch -PATCHFILES += buildbot-debug.patch -DISTFILES = $(NAME)-$(VERSION)$(PATCHLEVEL).tar.gz $(PATCHFILES) +#PATCHFILES += buildbot-debug.patch +DISTFILES += $(DISTNAME).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWbuildbot +SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle +# PKGFILES is catchall +RUNTIME_DEP_PKGSbuildbot += CSWcoreutils +RUNTIME_DEP_PKGSbuildbot += CSWpy-twisted +RUNTIME_DEP_PKGSbuildbot += CSWpy-zope-interface -PYCOMPILE = 1 +# This is more like an application than a python module +CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWbuildbot += catalogname-does-not-start-with-py_ -RUNTIME_DEP_PKGS += CSWcoreutils -RUNTIME_DEP_PKGS += CSWtwisted -RUNTIME_DEP_PKGS += CSWzope +ARCHALL_CSWbuildbot = 1 -ARCHALL = 1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = buildbot -TEST_SCRIPTS = -INSTALL_SCRIPTS = buildbot +# There seems to be 'trial' missing +SKIPTEST ?= 1 -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(PATCHLEVEL) - -CHECKPKG_OVERRIDES_CSWbuildbot += unidentified-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWtwisted -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWzope -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils - -build-buildbot: - (cd $(WORKSRC); python setup.py build) - @$(MAKECOOKIE) - -install-buildbot: - (cd $(WORKSRC); python setup.py install --root=$(DESTDIR)) - @$(MAKECOOKIE) - -post-install-modulated: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) - include gar/category.mk Modified: csw/mgar/pkg/buildbot/trunk/checksums =================================================================== --- csw/mgar/pkg/buildbot/trunk/checksums 2013-10-14 15:35:32 UTC (rev 22213) +++ csw/mgar/pkg/buildbot/trunk/checksums 2013-10-14 16:05:10 UTC (rev 22214) @@ -1,3 +1 @@ -5ba9559e2ef0d4e34a26815d95fc2d68 buildbot-0.7.12.tar.gz -4c70db04b3514157aa746370ad282eeb buildbot-debug.patch -a39720c9a13d73bbda054938d6a98c47 buildbot-tail.patch +472f512584bbb18cc677ca2ec3b3a905 buildbot-0.8.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Oct 14 21:54:00 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 14 Oct 2013 19:54:00 +0000 Subject: SF.net SVN: gar:[22215] csw/mgar/pkg/cpan/DBD-mysql/trunk Message-ID: Revision: 22215 http://gar.svn.sourceforge.net/gar/?rev=22215&view=rev Author: lblume Date: 2013-10-14 19:53:59 +0000 (Mon, 14 Oct 2013) Log Message: ----------- cpan/DBD-mysql/trunk: Bump to 4.024; upgrade the recipe Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2013-10-14 16:05:10 UTC (rev 22214) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2013-10-14 19:53:59 UTC (rev 22215) @@ -1,5 +1,5 @@ NAME = DBD-mysql -VERSION = 4.013 +VERSION = 4.024 CATEGORIES = cpan GARTYPE = v2 AUTHOR = CAPTTOFU @@ -14,20 +14,25 @@ ever requested them. endef - CATALOGNAME = pm_dbdmysql -PACKAGES = CSWpmdbdmysql +PACKAGES = CSWpmdbdmysql # ARCHALL_CSWpmdbdmysql = 1 LICENSE = README -BUILD_DEP_PKGS = CSWmysql5 CSWmysql5rt CSWmysql5devel CSWzlib CSWosslrt CSWpmdbi -RUNTIME_DEP_PKGS = CSWmysql5rt CSWzlib CSWosslrt CSWpmdbi +BUILD_DEP_PKGS += CSWmysql-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWpm-dbi +RUNTIME_DEP_PKGS += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS += CSWlibz1 +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWpm-dbi + CONFIGURE_ARGS += --ssl CONFIGURE_ARGS += --testuser=root -CONFIGURE_ARGS += --mysql_config=$(prefix)/mysql5/bin/mysql_config -EXTRA_LIB = $(prefix)/mysql5/lib/mysql +CONFIGURE_ARGS += --mysql_config=$(prefix)/bin/mysql_config +#EXTRA_LIB = $(prefix)/mysql5/lib/mysql include gar/category.mk Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums 2013-10-14 16:05:10 UTC (rev 22214) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/checksums 2013-10-14 19:53:59 UTC (rev 22215) @@ -1 +1 @@ -0b28c245eb4cc49d5071db91bd8819b1 DBD-mysql-4.013.tar.gz +280922d577aa95bf3f9ae21bd75e08c4 DBD-mysql-4.024.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Oct 14 22:35:08 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 14 Oct 2013 20:35:08 +0000 Subject: SF.net SVN: gar:[22216] csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Message-ID: Revision: 22216 http://gar.svn.sourceforge.net/gar/?rev=22216&view=rev Author: lblume Date: 2013-10-14 20:35:08 +0000 (Mon, 14 Oct 2013) Log Message: ----------- cpan/DBD-mysql/trunk: Fix package naming; Clean up some source Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2013-10-14 19:53:59 UTC (rev 22215) +++ csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile 2013-10-14 20:35:08 UTC (rev 22216) @@ -14,25 +14,29 @@ ever requested them. endef -CATALOGNAME = pm_dbdmysql -PACKAGES = CSWpmdbdmysql +CATALOGNAME = pm_dbd_mysql +PACKAGES = CSWpm-dbd-mysql -# ARCHALL_CSWpmdbdmysql = 1 - LICENSE = README BUILD_DEP_PKGS += CSWmysql-dev BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWpm-dbi -RUNTIME_DEP_PKGS += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS += CSWlibz1 -RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWpm-dbi +SPKG_DESC_CSWpm-dbd-mysql = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWpm-dbd-mysql += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWpm-dbd-mysql += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpm-dbd-mysql += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpm-dbd-mysql += CSWpm-dbi +OBSOLETED_BY_CSWpm-dbd-mysql = CSWpmdbdmysql + CONFIGURE_ARGS += --ssl CONFIGURE_ARGS += --testuser=root CONFIGURE_ARGS += --mysql_config=$(prefix)/bin/mysql_config -#EXTRA_LIB = $(prefix)/mysql5/lib/mysql +REINPLACE_WHEN_USRLOCAL = postinstall +REINPLACE_USRLOCAL += /opt/csw/lib/perl/csw/DBD/mysql.pm +REINPLACE_USRLOCAL += /opt/csw/lib/perl/csw/DBD/mysql/INSTALL.pod + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 15 00:34:19 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Oct 2013 22:34:19 +0000 Subject: SF.net SVN: gar:[22217] csw/mgar/pkg/lang-python/requests/trunk/Makefile Message-ID: Revision: 22217 http://gar.svn.sourceforge.net/gar/?rev=22217&view=rev Author: wahwah Date: 2013-10-14 22:34:19 +0000 (Mon, 14 Oct 2013) Log Message: ----------- lang-python/requests/trunk: Upgrade to 2.0.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/requests/trunk/Makefile Modified: csw/mgar/pkg/lang-python/requests/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/requests/trunk/Makefile 2013-10-14 20:35:08 UTC (rev 22216) +++ csw/mgar/pkg/lang-python/requests/trunk/Makefile 2013-10-14 22:34:19 UTC (rev 22217) @@ -2,28 +2,17 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = requests -# VERSION = 426734d -VERSION = 0.14.2 +VERSION = 2.0.0 GARTYPE = v2 CATEGORIES = python -DESCRIPTION = Python HTTP library -define BLURB - Long description -endef +DESCRIPTION = Python HTTP for Humans -# MASTER_SITES = https://github.com/kennethreitz/requests/tarball/ -MASTER_SITES = http://pypi.python.org/packages/source/r/requests/ DISTFILES = $(NAME)-$(VERSION).tar.gz - -# GIT_REPOS = http://github.com/kennethreitz/requests.git -# GIT_TREEISH_requests.git = $(VERSION) -NOGITPATCH = 1 - REINPLACE_USRLOCAL = requests/utils.py -VENDOR_URL = https://github.com/kennethreitz/requests +VENDOR_URL = https://pypi.python.org/pypi/requests RUNTIME_DEP_PKGS += CSWpy-chardet CHECKPKG_OVERRIDES_CSWpy-requests += surplus-dependency|CSWpy-chardet 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 Oct 15 00:46:42 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 14 Oct 2013 22:46:42 +0000 Subject: SF.net SVN: gar:[22218] csw/mgar/pkg/lang-python Message-ID: Revision: 22218 http://gar.svn.sourceforge.net/gar/?rev=22218&view=rev Author: wahwah Date: 2013-10-14 22:46:41 +0000 (Mon, 14 Oct 2013) Log Message: ----------- pydns: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/pydns/trunk/Makefile csw/mgar/pkg/lang-python/pydns/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pydns/ Modified: csw/mgar/pkg/lang-python/pydns/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pydns/trunk/Makefile 2013-10-14 22:46:41 UTC (rev 22218) @@ -1,35 +1,16 @@ # $Id$ -NAME = python-dateutil -VERSION = 1.5 +NAME = pydns +VERSION = 2.3.6 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Dateutil provides powerful extensions to the standard python datetime module -define BLURB - Dateutil offers functionality such as computing relative time deltas, - computing dates based on flexible recurrence rules, generic parsing of - dates, handling of tzfile(5) format files and computing of Easter - Sunday for various calendars. -endef +DESCRIPTION = Python DNS library -MASTER_SITES = http://labix.org/download/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz -SPKG_SOURCEURL = http://labix.org/$(NAME)/ -BUILD_DEP_PKGS = CSWpy-setuptools -PACKAGES = CSWpy-dateutil +SPKG_SOURCEURL = https://pypi.python.org/pypi/pydns +PACKAGES = CSWpy-dns -UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ - -TEST_SCRIPTS = dateutil - -LICENSE = LICENSE ARCHALL = 1 +TEST_SCRIPTS = -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/dateutil/tz.py -CHECKPKG_OVERRIDES_CSWpy-dateutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/dateutil/tz.py - include gar/category.mk - -test-dateutil: - (cd $(WORKSRC); python test.py) - @$(MAKECOOKIE) Modified: csw/mgar/pkg/lang-python/pydns/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pydns/trunk/checksums 2013-10-14 22:46:41 UTC (rev 22218) @@ -1 +1 @@ -35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz +e9574b74f01111405815a5fdccec15ce pydns-2.3.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 15 08:46:44 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Oct 2013 06:46:44 +0000 Subject: SF.net SVN: gar:[22219] csw/mgar/pkg/lang-python/chardet/trunk Message-ID: Revision: 22219 http://gar.svn.sourceforge.net/gar/?rev=22219&view=rev Author: wahwah Date: 2013-10-15 06:46:44 +0000 (Tue, 15 Oct 2013) Log Message: ----------- lang-python/chardet/trunk: Version upgrade Modified Paths: -------------- csw/mgar/pkg/lang-python/chardet/trunk/Makefile csw/mgar/pkg/lang-python/chardet/trunk/checksums Modified: csw/mgar/pkg/lang-python/chardet/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2013-10-14 22:46:41 UTC (rev 22218) +++ csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2013-10-15 06:46:44 UTC (rev 22219) @@ -3,7 +3,7 @@ # $Id$ NAME = chardet -VERSION = 1.0.1 +VERSION = 2.1.1 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/chardet/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/checksums 2013-10-14 22:46:41 UTC (rev 22218) +++ csw/mgar/pkg/lang-python/chardet/trunk/checksums 2013-10-15 06:46:44 UTC (rev 22219) @@ -1 +1 @@ -7c28b02bca7847c13bebedaf4df6c5a3 chardet-1.0.1.tar.gz +295367fd210d20f3febda615a88e1ef0 chardet-2.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Oct 15 09:07:24 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Oct 2013 07:07:24 +0000 Subject: SF.net SVN: gar:[22220] csw/mgar/pkg/lang-python Message-ID: Revision: 22220 http://gar.svn.sourceforge.net/gar/?rev=22220&view=rev Author: wahwah Date: 2013-10-15 07:07:22 +0000 (Tue, 15 Oct 2013) Log Message: ----------- pycountry: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/pycountry/ csw/mgar/pkg/lang-python/pycountry/trunk/Makefile csw/mgar/pkg/lang-python/pycountry/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pycountry/trunk/Makefile csw/mgar/pkg/lang-python/pycountry/trunk/checksums Deleted: csw/mgar/pkg/lang-python/pycountry/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pycountry/trunk/Makefile 2013-10-15 07:07:22 UTC (rev 22220) @@ -1,20 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = chardet -VERSION = 1.0.1 -CATEGORIES = python -GARTYPE = v2 - -DESCRIPTION = Universal encoding detector - -MASTER_SITES = $(PYPI_MIRROR) -DISTFILES = $(DISTNAME).tar.gz - -VENDOR_URL = http://pypi.python.org/pypi/chardet - -PACKAGES = CSWpy-chardet -ARCHALL_CSWpy-chardet = 1 - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/pycountry/trunk/Makefile (from rev 22219, csw/mgar/pkg/lang-python/chardet/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/pycountry/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pycountry/trunk/Makefile 2013-10-15 07:07:22 UTC (rev 22220) @@ -0,0 +1,19 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = pycountry +VERSION = 1.1 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = ISO country, subdivision, language, currency and script definitions and their translations + +DISTFILES = $(DISTNAME).zip + +VENDOR_URL = https://pypi.python.org/pypi/pycountry + +PACKAGES = CSWpy-country +ARCHALL_CSWpy-country = 1 + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/pycountry/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/chardet/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/pycountry/trunk/checksums 2013-10-15 07:07:22 UTC (rev 22220) @@ -1 +0,0 @@ -7c28b02bca7847c13bebedaf4df6c5a3 chardet-1.0.1.tar.gz Copied: csw/mgar/pkg/lang-python/pycountry/trunk/checksums (from rev 22219, csw/mgar/pkg/lang-python/chardet/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/pycountry/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pycountry/trunk/checksums 2013-10-15 07:07:22 UTC (rev 22220) @@ -0,0 +1 @@ +add6b7fcf64461902d3e0fb7d3a3682f pycountry-1.1.zip 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 Oct 15 09:11:41 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 15 Oct 2013 07:11:41 +0000 Subject: SF.net SVN: gar:[22221] csw/mgar/pkg/lang-python/requests/trunk Message-ID: Revision: 22221 http://gar.svn.sourceforge.net/gar/?rev=22221&view=rev Author: wahwah Date: 2013-10-15 07:11:41 +0000 (Tue, 15 Oct 2013) Log Message: ----------- lang-python/requests/trunk: py_chardet as a build dep Modified Paths: -------------- csw/mgar/pkg/lang-python/requests/trunk/Makefile csw/mgar/pkg/lang-python/requests/trunk/checksums Modified: csw/mgar/pkg/lang-python/requests/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/requests/trunk/Makefile 2013-10-15 07:07:22 UTC (rev 22220) +++ csw/mgar/pkg/lang-python/requests/trunk/Makefile 2013-10-15 07:11:41 UTC (rev 22221) @@ -14,7 +14,7 @@ VENDOR_URL = https://pypi.python.org/pypi/requests -RUNTIME_DEP_PKGS += CSWpy-chardet +DEP_PKGS += CSWpy-chardet CHECKPKG_OVERRIDES_CSWpy-requests += surplus-dependency|CSWpy-chardet PACKAGES = CSWpy-requests Modified: csw/mgar/pkg/lang-python/requests/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/requests/trunk/checksums 2013-10-15 07:07:22 UTC (rev 22220) +++ csw/mgar/pkg/lang-python/requests/trunk/checksums 2013-10-15 07:11:41 UTC (rev 22221) @@ -1 +1 @@ -488508ba3e8270992ad5b3fb54d364ca requests-0.14.2.tar.gz +856fc825c17483e25fd55db115028e3f requests-2.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 15 11:22:29 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 15 Oct 2013 09:22:29 +0000 Subject: SF.net SVN: gar:[22222] csw/mgar/pkg/libdvdcss/trunk Message-ID: Revision: 22222 http://gar.svn.sourceforge.net/gar/?rev=22222&view=rev Author: pfelecan Date: 2013-10-15 09:22:28 +0000 (Tue, 15 Oct 2013) Log Message: ----------- libdvdcss/trunk: - bumped to last stable revision from upstream - adapted the recipe to the current version of gar - patched USCSI detection - removed old cruft Modified Paths: -------------- csw/mgar/pkg/libdvdcss/trunk/Makefile csw/mgar/pkg/libdvdcss/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch Removed Paths: ------------- csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/Makefile 2013-10-15 07:11:41 UTC (rev 22221) +++ csw/mgar/pkg/libdvdcss/trunk/Makefile 2013-10-15 09:22:28 UTC (rev 22222) @@ -1,23 +1,29 @@ -NAME = libdvdcss -VERSION = 1.2.9 -GARTYPE = v1 +# $Id$ -DESCRIPTION = library for accessing DVDs like a block device without having to bother about decryption +NAME = libdvdcss +VERSION = 1.2.13 +GARTYPE = v2 + +DESCRIPTION = Library for accessing DVDs like a block device without having to bother about decryption + define BLURB -library for accessing DVDs like a block device without having to bother about decryption + Library for accessing DVDs like a block device without having to bother about decryption endef -MASTER_SITES = http://download.videolan.org/pub/libdvdcss/1.2.9/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibdvdcss, depend ) +MASTER_SITES = http://download.videolan.org/pub/$(NAME)/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +PATCHFILES += 0001-fix-uscsi-detection.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = GNU -GARCOMPILER ?= GNU +CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS_CSWlibdvdcss += CSWlibgcc-s1 -#ENABLE_TEST = 0 +include gar/category.mk -include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) + +pre-configure-modulated: + cd $(WORKSRC); autoreconf -fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libdvdcss/trunk/checksums =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/checksums 2013-10-15 07:11:41 UTC (rev 22221) +++ csw/mgar/pkg/libdvdcss/trunk/checksums 2013-10-15 09:22:28 UTC (rev 22222) @@ -1,3 +1 @@ -bec67a57436a7f80c5aeb3c3abccbd9e download/libdvdcss-1.2.9.tar.gz -975b7e10de329f223bc0e81b00b08f4b download/CSWlibdvdcss.gspec -4f37936126869c441ba900ecc362bc00 download/CSWlibdvdcss.depend +53cfc52a60a156763c425572e5179273 libdvdcss-1.2.13.tar.bz2 Added: csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch (rev 0) +++ csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch 2013-10-15 09:22:28 UTC (rev 22222) @@ -0,0 +1,25 @@ +From 5466eff64940b0a089f0b38869122079803e4194 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 15 Oct 2013 11:05:41 +0200 +Subject: [PATCH] fix uscsi detection + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a736aac..3c13580 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -174,7 +174,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ + dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h + dnl + solaris_uscsi=yes +- AC_CHECK_HEADERS([sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h], [], ++ AC_CHECK_HEADERS([sys/scsi/scsi_types.h sys/scsi/impl/uscsi.h], [], + [solaris_uscsi=no; break;]) + AS_IF([test "$solaris_uscsi" = "yes"], [ + AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.) +-- +1.8.3.4 + Deleted: csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend 2013-10-15 07:11:41 UTC (rev 22221) +++ csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend 2013-10-15 09:22:28 UTC (rev 22222) @@ -1,2 +0,0 @@ -P CSWgcc3corert gcc3corert - GNU C Compiler Run Time -P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time Deleted: csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec 2013-10-15 07:11:41 UTC (rev 22221) +++ csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec 2013-10-15 09:22:28 UTC (rev 22222) @@ -1,4 +0,0 @@ -%var bitname libdvdcss -%var pkgname CSWlibdvdcss -%include url file://%{GARDIR}/pkglib/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 15 11:40:55 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 15 Oct 2013 09:40:55 +0000 Subject: SF.net SVN: gar:[22223] csw/mgar/pkg/libdvdcss/trunk/Makefile Message-ID: Revision: 22223 http://gar.svn.sourceforge.net/gar/?rev=22223&view=rev Author: pfelecan Date: 2013-10-15 09:40:54 +0000 (Tue, 15 Oct 2013) Log Message: ----------- libdvdcss/trunk: split in sub-packages Modified Paths: -------------- csw/mgar/pkg/libdvdcss/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libdvdcss/trunk/Makefile Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/Makefile 2013-10-15 09:22:28 UTC (rev 22222) +++ csw/mgar/pkg/libdvdcss/trunk/Makefile 2013-10-15 09:40:54 UTC (rev 22223) @@ -4,7 +4,7 @@ VERSION = 1.2.13 GARTYPE = v2 -DESCRIPTION = Library for accessing DVDs like a block device without having to bother about decryption +DESCRIPTION = Library for accessing DVDs without having to bother about decryption define BLURB Library for accessing DVDs like a block device without having to bother about decryption @@ -14,12 +14,36 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 PATCHFILES += 0001-fix-uscsi-detection.patch +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWlibdvdcss += CSWlibgcc-s1 +PACKAGES = CSWlibdvdcss2 +CATALOGNAME_CSWlibdvdcss2 = libdvdcss2 +SPKG_DESC_CSWlibdvdcss2 = $(DESCRIPTION), libdvdcss.so.2 +PKGFILES_CSWlibdvdcss2 += $(call baseisadirs,$(libdir),libdvdcss\.so\.2\.1\.0) +PKGFILES_CSWlibdvdcss2 += $(call baseisadirs,$(libdir),libdvdcss\.so\.2(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibdvdcss2 += CSWlibgcc-s1 +PACKAGES += CSWlibdvdcss-doc +CATALOGNAME_CSWlibdvdcss-doc = libdvdcss_doc +SPKG_DESC_CSWlibdvdcss-doc += $(DESCRIPTION), documentation +PKGFILES_CSWlibdvdcss-doc += /opt/csw/share/doc/$(NAME)/.* +ARCHALL_CSWlibdvdcss-doc = 1 + +PACKAGES += CSWlibdvdcss-dev +CATALOGNAME_CSWlibdvdcss-dev = libdvdcss_dev +SPKG_DESC_CSWlibdvdcss-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibdvdcss-dev += /opt/csw/lib/libdvdcss.so +PKGFILES_CSWlibdvdcss-dev += $(PKGFILES_DEVEL) +#PKGFILES_CSWlibdvdcss-dev += /opt/csw/share/pkgconfig/autoopts.pc +RUNTIME_DEP_PKGS_CSWlibdvdcss-dev += CSWlibdvdcss2 +CHECKPKG_OVERRIDES_CSWlibdvdcss-dev += archall-devel-package +ARCHALL_CSWlibdvdcss-dev = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/libdvdcss/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 pfelecan at users.sourceforge.net Tue Oct 15 12:07:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 15 Oct 2013 10:07:07 +0000 Subject: SF.net SVN: gar:[22224] csw/mgar/pkg/libdvdread/trunk/Makefile Message-ID: Revision: 22224 http://gar.svn.sourceforge.net/gar/?rev=22224&view=rev Author: pfelecan Date: 2013-10-15 10:07:07 +0000 (Tue, 15 Oct 2013) Log Message: ----------- libdvdread/trunk: minor adjustements Modified Paths: -------------- csw/mgar/pkg/libdvdread/trunk/Makefile Modified: csw/mgar/pkg/libdvdread/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdread/trunk/Makefile 2013-10-15 09:40:54 UTC (rev 22223) +++ csw/mgar/pkg/libdvdread/trunk/Makefile 2013-10-15 10:07:07 UTC (rev 22224) @@ -1,10 +1,10 @@ # $Id$ -NAME = libdvdread -VERSION = 4.2.0 -GARTYPE = v2 +NAME = libdvdread +VERSION = 4.2.0 +GARTYPE = v2 -DESCRIPTION = Library for reading DVD-Video images +DESCRIPTION = Library for reading DVD-Video images define BLURB libdvdread currently uses libdl to dynamically probe for libdvdcss at runtime. If libdvdcss is found, then it will be used to decrypt the @@ -18,29 +18,33 @@ DISTNAME = $(GITHUB_USER)-$(NAME)-$(GITHUB_REFERENCE) DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 -TEST_SCRIPTS = +GARCOMPILER = GNU -GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) -PACKAGES = +TEST_SCRIPTS = -PACKAGES += CSWlibdvdread4 -PKGFILES_CSWlibdvdread4 += $(call baseisadirs,$(libdir),libdvdread\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibdvdread4 += $(DESCRIPTION), libdvdread.so.4 -RUNTIME_DEP_PKGS_CSWlibdvdread4 += CSWlibgcc-s1 +PACKAGES = CSWlibdvdread4 +PKGFILES_CSWlibdvdread4 += $(call baseisadirs,$(libdir),libdvdread\.so\.4(\.\d+)*) +PKGFILES_CSWlibdvdread4 += $(call baseisadirs,$(libdir),libdvdread\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibdvdread4 += $(DESCRIPTION), libdvdread.so.4 +RUNTIME_DEP_PKGS_CSWlibdvdread4 += CSWlibgcc-s1 +OBSOLETED_BY_CSWlibdvdread4 = CSWlibdvdread -PACKAGES += CSWlibdvdread-dev -SPKG_DESC_CSWlibdvdread-dev += $(DESCRIPTION), development files -PKGFILES_CSWlibdvdread-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibdvdread-dev += CSWlibdvdread4 +PACKAGES += CSWlibdvdread-dev +SPKG_DESC_CSWlibdvdread-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibdvdread-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibdvdread-dev += /opt/csw/lib/libdvdread.so +RUNTIME_DEP_PKGS_CSWlibdvdread-dev += CSWlibdvdread4 +OBSOLETED_BY_CSWlibdvdread-dev = CSWlibdvdreaddevel -OBSOLETED_BY_CSWlibdvdread4 = CSWlibdvdread -OBSOLETED_BY_CSWlibdvdread-dev = CSWlibdvdreaddevel - include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) + pre-configure-modulated: cd $(WORKSRC); autoreconf -fi @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 15 14:30:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 15 Oct 2013 12:30:09 +0000 Subject: SF.net SVN: gar:[22225] csw/mgar/pkg Message-ID: Revision: 22225 http://gar.svn.sourceforge.net/gar/?rev=22225&view=rev Author: pfelecan Date: 2013-10-15 12:30:08 +0000 (Tue, 15 Oct 2013) Log Message: ----------- libdvdnav/trunk: instantiation Added Paths: ----------- csw/mgar/pkg/libdvdnav/ csw/mgar/pkg/libdvdnav/Makefile csw/mgar/pkg/libdvdnav/branches/ csw/mgar/pkg/libdvdnav/tags/ csw/mgar/pkg/libdvdnav/trunk/ csw/mgar/pkg/libdvdnav/trunk/Makefile csw/mgar/pkg/libdvdnav/trunk/checksums csw/mgar/pkg/libdvdnav/trunk/files/ Added: csw/mgar/pkg/libdvdnav/Makefile =================================================================== --- csw/mgar/pkg/libdvdnav/Makefile (rev 0) +++ csw/mgar/pkg/libdvdnav/Makefile 2013-10-15 12:30:08 UTC (rev 22225) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libdvdnav/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libdvdnav/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdnav/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libdvdnav/trunk/Makefile 2013-10-15 12:30:08 UTC (rev 22225) @@ -0,0 +1,57 @@ +# $Id$ + +NAME = libdvdnav +VERSION = 4.2.0 +GARTYPE = v2 + +DESCRIPTION = Library that allows easy use of sophisticated DVD navigation +define BLURB + libdvdnav is a library that allows easy use of sophisticated DVD + navigation features such as DVD menus, multiangle playback and + even interactive DVD games. +endef + +GITHUB_USER = microe +GITHUB_REFERENCE= 73a49e6 +MASTER_SITES = $(GITHUB_MIRROR) +VENDOR_URL = http://dvdnav.mplayerhq.hu/ +DISTNAME = $(GITHUB_USER)-$(NAME)-$(GITHUB_REFERENCE) +DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_DEP_PKGS += CSWlibdvdread-dev + +PACKAGES = CSWlibdvdnav4 +PKGFILES_CSWlibdvdnav4 += $(call baseisadirs,$(libdir),libdvdnav\.so\.4(\.\d+)*) +PKGFILES_CSWlibdvdnav4 += $(call baseisadirs,$(libdir),libdvdnav\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibdvdnav4 += $(DESCRIPTION), libdvdnav.so.4 +RUNTIME_DEP_PKGS_CSWlibdvdnav4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdvdnav4 += CSWlibdvdread4 + +PACKAGES += CSWlibdvdnavmini4 +PKGFILES_CSWlibdvdnavmini4 += $(call baseisadirs,$(libdir),libdvdnavmini\.so\.4(\.\d+)*) +PKGFILES_CSWlibdvdnavmini4 += $(call baseisadirs,$(libdir),libdvdnavmini\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibdvdnavmini4 += $(DESCRIPTION), libdvdnavmini.so.4 +RUNTIME_DEP_PKGS_CSWlibdvdnavmini4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibdvdnavmini4 += CSWlibdvdread4 + +PACKAGES += CSWlibdvdnav-dev +SPKG_DESC_CSWlibdvdnav-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibdvdnav-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibdvdnav-dev += /opt/csw/lib/libdvdnav.so +RUNTIME_DEP_PKGS_CSWlibdvdnav-dev += CSWlibdvdnav4 +RUNTIME_DEP_PKGS_CSWlibdvdnav-dev += CSWlibdvdnavmini4 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +pre-configure-modulated: + cd $(WORKSRC); autoreconf -fi + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libdvdnav/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libdvdnav/trunk/checksums =================================================================== --- csw/mgar/pkg/libdvdnav/trunk/checksums (rev 0) +++ csw/mgar/pkg/libdvdnav/trunk/checksums 2013-10-15 12:30:08 UTC (rev 22225) @@ -0,0 +1 @@ +389c50d28b1a28a431cd58b9a1be3e6c libdvdnav-4.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 15 16:43:30 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 15 Oct 2013 14:43:30 +0000 Subject: SF.net SVN: gar:[22226] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/ CSWmysql5.postinstall Message-ID: Revision: 22226 http://gar.svn.sourceforge.net/gar/?rev=22226&view=rev Author: lblume Date: 2013-10-15 14:43:26 +0000 (Tue, 15 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Still not quite sure what was intended with that postinstall, but fixes it a bit more; also, missing double-quote Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2013-10-15 12:30:08 UTC (rev 22225) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/CSWmysql5.postinstall 2013-10-15 14:43:26 UTC (rev 22226) @@ -15,7 +15,7 @@ MYSQL_HOME="/var${prefix}/mysql5" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 -DEFAULTS_FILE="${prefix}/share/mysql5/support-files/my-small.cnf +DEFAULTS_FILE="${sysconfdir}/my.cnf" MYSQLD_USER="mysql" MYSQLD_GROUP="mysql" # Provide the default data directory @@ -33,7 +33,7 @@ fi if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql5/support-files/my-small.cnf + IN_DEFAULTS_FILE=${prefix}/share/mysql5/support-files/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -70,6 +70,7 @@ --user="$MYSQLD_USER" \ --basedir="$BASEDIR" \ --datadir="$MYSQLD_DATADIR" +echo "### End mysql_install_db messages." # Fix permissions on the data directory, since mysql_install_db was run as # root. 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 Oct 15 22:09:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Oct 2013 20:09:17 +0000 Subject: SF.net SVN: gar:[22227] csw/mgar/pkg/xapian-core/trunk/Makefile Message-ID: Revision: 22227 http://gar.svn.sourceforge.net/gar/?rev=22227&view=rev Author: dmichelsen Date: 2013-10-15 20:09:16 +0000 (Tue, 15 Oct 2013) Log Message: ----------- xapian-core/trunk: Add comments about bug urls for the patches Modified Paths: -------------- csw/mgar/pkg/xapian-core/trunk/Makefile Modified: csw/mgar/pkg/xapian-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-10-15 14:43:26 UTC (rev 22226) +++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-10-15 20:09:16 UTC (rev 22227) @@ -14,13 +14,13 @@ PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch -# This is strange and needs further examination +# Use patch until this is fixed: +# http://trac.xapian.org/ticket/628 PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch # Use patch until this is fixed: # http://trac.xapian.org/ticket/627 PATCHFILES += 0003-log-is-ambigous-to-float-and-double.patch - PATCHFILES += 0001-Force-float-to-disambiguise-float-double-invocation-.patch VENDOR_URL = http://xapian.org/ @@ -48,7 +48,8 @@ EXTRA_LD_FLAGS += -norunpath -# libuuid.so must be searched in /opt/csw/lib +# libuuid.so must be searched in /opt/csw/lib, use explicit setting until this is fixed: +# http://trac.xapian.org/ticket/626 EXTRA_CXXFLAGS += -L$(libdir) BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 15 22:11:40 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Oct 2013 20:11:40 +0000 Subject: SF.net SVN: opencsw:[665] buildfarm/bin/check-catalogs Message-ID: <3cznpy07Zmz1X1@mail.opencsw.org> Revision: 665 http://sourceforge.net/p/opencsw/code/665 Author: dmichelsen Date: 2013-10-15 20:11:36 +0000 (Tue, 15 Oct 2013) Log Message: ----------- web: Add check-catalogs Added Paths: ----------- buildfarm/bin/check-catalogs Added: buildfarm/bin/check-catalogs =================================================================== --- buildfarm/bin/check-catalogs (rev 0) +++ buildfarm/bin/check-catalogs 2013-10-15 20:11:36 UTC (rev 665) @@ -0,0 +1,18 @@ +#!/bin/sh + +PYTHONPATH=/home/web/bin/gar +export PYTHONPATH + +CACHE=/home/web/tmp/cache/chkdbcat +mkdir -p $CACHE + +curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/ | \ + /opt/csw/bin/python -c 'import json, sys; a = json.loads(sys.stdin.read()); print "\n".join(" ".join(x) for x in a)' | \ + while read R A C; do \ + echo $R $A $C; \ + /home/web/bin/gar/bin/chkdbcat --os-release $R --arch $A --catalog-release $C --timestamp-file $CACHE/timestamp-$C-$A-$R.json; \ + done + + + + Property changes on: buildfarm/bin/check-catalogs ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property 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 Oct 15 22:12:27 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Oct 2013 20:12:27 +0000 Subject: SF.net SVN: gar:[22228] csw/mgar/gar/v2/lib/python/rest.py Message-ID: Revision: 22228 http://gar.svn.sourceforge.net/gar/?rev=22228&view=rev Author: dmichelsen Date: 2013-10-15 20:12:26 +0000 (Tue, 15 Oct 2013) Log Message: ----------- web rest.py: Add debug output Modified Paths: -------------- csw/mgar/gar/v2/lib/python/rest.py Modified: csw/mgar/gar/v2/lib/python/rest.py =================================================================== --- csw/mgar/gar/v2/lib/python/rest.py 2013-10-15 20:09:16 UTC (rev 22227) +++ csw/mgar/gar/v2/lib/python/rest.py 2013-10-15 20:12:26 UTC (rev 22228) @@ -250,6 +250,7 @@ def GetCatalogForGeneration(self, catrel, arch, osrel): url = (self.rest_url + self.PKGDB_APP + "/catalogs/%s/%s/%s/for-generation/" % (catrel, arch, osrel)) + logging.debug("GetCatalogForGeneration(): url=%r", url) data = urllib2.urlopen(url).read() return cjson.decode(data) 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 Oct 15 22:46:38 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 15 Oct 2013 20:46:38 +0000 Subject: SF.net SVN: opencsw:[666] buildfarm/bin/check-catalogs Message-ID: <3czpbC2P1yzD5@mail.opencsw.org> Revision: 666 http://sourceforge.net/p/opencsw/code/666 Author: dmichelsen Date: 2013-10-15 20:46:38 +0000 (Tue, 15 Oct 2013) Log Message: ----------- check-catalogs: Tiny changes Modified Paths: -------------- buildfarm/bin/check-catalogs Modified: buildfarm/bin/check-catalogs =================================================================== --- buildfarm/bin/check-catalogs 2013-10-15 20:11:36 UTC (rev 665) +++ buildfarm/bin/check-catalogs 2013-10-15 20:46:38 UTC (rev 666) @@ -9,8 +9,7 @@ curl -s http://buildfarm.opencsw.org/pkgdb/rest/catalogs/ | \ /opt/csw/bin/python -c 'import json, sys; a = json.loads(sys.stdin.read()); print "\n".join(" ".join(x) for x in a)' | \ while read R A C; do \ - echo $R $A $C; \ - /home/web/bin/gar/bin/chkdbcat --os-release $R --arch $A --catalog-release $C --timestamp-file $CACHE/timestamp-$C-$A-$R.json; \ + /home/web/bin/gar/bin/chkdbcat --os-release $R --arch $A --catalog-release $C --timestamp-file $CACHE/timestamp-$C-$A-$R.json --verbose; \ done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 16 11:04:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 16 Oct 2013 09:04:07 +0000 Subject: SF.net SVN: gar:[22229] csw/mgar/pkg/libxvidcore/trunk/Makefile Message-ID: Revision: 22229 http://gar.svn.sourceforge.net/gar/?rev=22229&view=rev Author: pfelecan Date: 2013-10-16 09:04:05 +0000 (Wed, 16 Oct 2013) Log Message: ----------- libxvidcore/trunk: - fix run-time dependency - fix DSO symbolic links Modified Paths: -------------- csw/mgar/pkg/libxvidcore/trunk/Makefile Modified: csw/mgar/pkg/libxvidcore/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxvidcore/trunk/Makefile 2013-10-15 20:12:26 UTC (rev 22228) +++ csw/mgar/pkg/libxvidcore/trunk/Makefile 2013-10-16 09:04:05 UTC (rev 22229) @@ -28,24 +28,25 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -PACKAGES += CSWlibxvidcore4 -CATALOGNAME_CSWlibxvidcore4 = libxvidcore4 -PKGFILES_CSWlibxvidcore4 += $(call baseisadirs,$(libdir),libxvidcore\.so\.4\.3) -PKGFILES_CSWlibxvidcore4 += $(call baseisadirs,$(libdir),libxvidcore\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibxvidcore4 += $(DESCRIPTION), libxvidcore.so.4 -RUNTIME_DEP_PKGS_CSWlibxvidcore += CSWlibxvidcore4 -OBSOLETED_BY_CSWlibxvidcore4 = CSWlibxvidcore -CATALOGNAME_CSWlibxvidcore = libxvidcore_stub +PACKAGES += CSWlibxvidcore4 +CATALOGNAME_CSWlibxvidcore4 = libxvidcore4 +PKGFILES_CSWlibxvidcore4 += $(call baseisadirs,$(libdir),libxvidcore\.so\.4\.3) +PKGFILES_CSWlibxvidcore4 += $(call baseisadirs,$(libdir),libxvidcore\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibxvidcore4 += $(DESCRIPTION), libxvidcore.so.4 +OBSOLETED_BY_CSWlibxvidcore4 = CSWlibxvidcore +CATALOGNAME_CSWlibxvidcore = libxvidcore_stub +CHECKPKG_OVERRIDES_CSWlibxvidcore4 += no-direct-binding|/opt/csw/lib/libxvidcore.so.4.3|is|not|directly|bound|to|soname|libgcc_s.so.1 -PACKAGES += CSWlibxvidcore-dev -CATALOGNAME_CSWlibxvidcore-dev = libxvidcore_dev -SPKG_DESC_CSWlibxvidcore-dev += $(DESCRIPTION), development files -PKGFILES_CSWlibxvidcore-dev += /opt/csw/lib/libxvidcore.4.so -PKGFILES_CSWlibxvidcore-dev += $(PKGFILES_DEVEL) -OBSOLETED_BY_CSWlibxvidcore-dev = CSWlibxvidcoredevel -CATALOGNAME_CSWlibxvidcoredevel = libxvidcore_devel_stub -ARCHALL_CSWlibxvidcore-dev = 1 -CHECKPKG_OVERRIDES_CSWlibxvidcore-dev += archall-devel-package +PACKAGES += CSWlibxvidcore-dev +CATALOGNAME_CSWlibxvidcore-dev = libxvidcore_dev +SPKG_DESC_CSWlibxvidcore-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibxvidcore-dev += /opt/csw/lib/libxvidcore.4.so +PKGFILES_CSWlibxvidcore-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibxvidcore-dev += CSWlibxvidcore4 +OBSOLETED_BY_CSWlibxvidcore-dev = CSWlibxvidcoredevel +CATALOGNAME_CSWlibxvidcoredevel = libxvidcore_devel_stub +ARCHALL_CSWlibxvidcore-dev = 1 +CHECKPKG_OVERRIDES_CSWlibxvidcore-dev += archall-devel-package include gar/category.mk @@ -62,8 +63,8 @@ $(MAKECOOKIE) post-install-modulated: - cd $(DESTDIR)/$(libdir) && ln -s libxvidcore.4.3.so libxvidcore.4.so - cd $(DESTDIR)/$(libdir) && ln -s libxvidcore.4.so libxvidcore.so + cd $(DESTDIR)/$(libdir) && ln -s libxvidcore.so.4.3 libxvidcore.so.4 + cd $(DESTDIR)/$(libdir) && ln -s libxvidcore.so.4 libxvidcore.so $(MAKECOOKIE) # this is private and not available publicly 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 Oct 16 15:37:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 13:37:35 +0000 Subject: SF.net SVN: gar:[22230] csw/mgar/pkg/grep/trunk Message-ID: Revision: 22230 http://gar.svn.sourceforge.net/gar/?rev=22230&view=rev Author: dmichelsen Date: 2013-10-16 13:37:33 +0000 (Wed, 16 Oct 2013) Log Message: ----------- grep/trunk: Wiork around issue with wcscoll Modified Paths: -------------- csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/grep/trunk/checksums Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2013-10-16 09:04:05 UTC (rev 22229) +++ csw/mgar/pkg/grep/trunk/Makefile 2013-10-16 13:37:33 UTC (rev 22230) @@ -1,5 +1,5 @@ NAME = grep -VERSION = 2.11 +VERSION = 2.14 GARTYPE = v2 DESCRIPTION = GNU grep @@ -26,7 +26,12 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --program-prefix=g +CONFIGURE_ARGS += --with-included-regex +# Use GNUlib for wcscoll as there is an issue with the ru_RU.KOI8-R locale +# See for details http://lists.gnu.org/archive/html/bug-grep/2013-10/msg00020.html +EXTRA_CONFIGURE_ENV += ac_cv_func_wcscoll=no + EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias include gar/category.mk Modified: csw/mgar/pkg/grep/trunk/checksums =================================================================== --- csw/mgar/pkg/grep/trunk/checksums 2013-10-16 09:04:05 UTC (rev 22229) +++ csw/mgar/pkg/grep/trunk/checksums 2013-10-16 13:37:33 UTC (rev 22230) @@ -1 +1 @@ -ad9c6dbdeab93e50d2bc380f10ed3643 grep-2.11.tar.xz +d4a3f03849d1e17ce56ab76aa5a24cab grep-2.14.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 16 16:47:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 14:47:10 +0000 Subject: SF.net SVN: gar:[22231] csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile Message-ID: Revision: 22231 http://gar.svn.sourceforge.net/gar/?rev=22231&view=rev Author: dmichelsen Date: 2013-10-16 14:47:06 +0000 (Wed, 16 Oct 2013) Log Message: ----------- lang-python/sqlalchemy/trunk: Update to 0.8.2 and new deps for dual Python versioning Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-16 13:37:33 UTC (rev 22230) +++ csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-16 14:47:06 UTC (rev 22231) @@ -9,12 +9,10 @@ VERSION = 0.8.2 CATEGORIES = python -PACKAGES = CSWpy-sqlalchemy -DESCRIPTION = Python SQL toolkit and Object Relational Mapper - -VENDOR_URL = http://www.sqlalchemy.org/ DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.sqlalchemy.org/ LICENSE = LICENSE RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibgcc-s1 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 Oct 16 16:48:53 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 14:48:53 +0000 Subject: SF.net SVN: gar:[22232] csw/mgar/pkg/lang-python Message-ID: Revision: 22232 http://gar.svn.sourceforge.net/gar/?rev=22232&view=rev Author: dmichelsen Date: 2013-10-16 14:48:53 +0000 (Wed, 16 Oct 2013) Log Message: ----------- lang-python/sqlalchemy-migrate: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/Makefile csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/sqlalchemy-migrate/ Modified: csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/Makefile 2013-10-16 14:48:53 UTC (rev 22232) @@ -2,22 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# There are failing unit tests; the issue is submitted upstream: -# http://www.sqlalchemy.org/trac/ticket/1837 - -NAME = SQLAlchemy -VERSION = 0.8.0 +NAME = sqlalchemy-migrate +VERSION = 0.7.2 CATEGORIES = python -PACKAGES = CSWpy-sqlalchemy -DESCRIPTION = Python SQL toolkit and Object Relational Mapper - -VENDOR_URL = http://www.sqlalchemy.org/ MASTER_SITES = $(PYPI_MIRROR) DISTNAME = $(NAME)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -LICENSE = LICENSE -RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-6-1-0 +VENDOR_URL = http://www.sqlalchemy.org/ +LICENSE_TEXT = This program is licensed under the MIT license +PACKAGES += CSWpy-sqlalchemy-migrate +SPKG_DESC_CSWpy-sqlalchemy-migrate = Python SQL toolkit and Object Relational Mapper +# PKGFILES is catchall +ARCHALL_CSWpy-sqlalchemy-migrate = 1 + include gar/category.mk Modified: csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/sqlalchemy-migrate/trunk/checksums 2013-10-16 14:48:53 UTC (rev 22232) @@ -1 +1 @@ -11cd07ca81fab78d53f2922b5fb187a3 SQLAlchemy-0.8.0.tar.gz +10382fda16f056491e671b5307dd6713 sqlalchemy-migrate-0.7.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 Oct 16 17:20:17 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 15:20:17 +0000 Subject: SF.net SVN: gar:[22233] csw/mgar/pkg/lang-python Message-ID: Revision: 22233 http://gar.svn.sourceforge.net/gar/?rev=22233&view=rev Author: dmichelsen Date: 2013-10-16 15:20:17 +0000 (Wed, 16 Oct 2013) Log Message: ----------- lang-python/tempita: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/tempita/ csw/mgar/pkg/lang-python/tempita/trunk/Makefile csw/mgar/pkg/lang-python/tempita/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/tempita/trunk/Makefile csw/mgar/pkg/lang-python/tempita/trunk/checksums Deleted: csw/mgar/pkg/lang-python/tempita/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/Makefile 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/tempita/trunk/Makefile 2013-10-16 15:20:17 UTC (rev 22233) @@ -1,44 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = twisted -MAJ_VERSION = 12.2 -PATCHLEVEL = 0 -VERSION = $(MAJ_VERSION).$(PATCHLEVEL) -CATEGORIES = python -GARTYPE = v2 - -define BLURB - Twisted is a networking engine written in Python, supporting numerous - protocols. It contains a web server, numerous chat clients, chat servers, - mail servers, and more. -endef - -PYPI_PROJECT = Twisted -MASTER_SITES += $(PYPI_MIRROR) -DISTNAME = $(PYPI_PROJECT)-$(VERSION) -DISTFILES += $(DISTNAME).tar.bz2 -# TEST_SCRIPTS = - -LICENSE = LICENSE - -PACKAGES += CSWpy-twisted -SPKG_DESC_CSWpy-twisted = An event-driven networking engine -RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface -OBSOLETED_BY_CSWpy-twisted = CSWtwisted - -ARCHALL_CSWtwisted = 1 - -# CSWtwisted is now empty, so we need to tell checkpkg that it really needs to -# depend on these two packages. -CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpy-twisted -CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/tap/ftp.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/unix.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/openssh_compat/factory.py -CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/twisted/scripts/tap2deb.py - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/tempita/trunk/Makefile (from rev 22208, csw/mgar/pkg/lang-python/twisted/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/tempita/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/tempita/trunk/Makefile 2013-10-16 15:20:17 UTC (rev 22233) @@ -0,0 +1,23 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = Tempita +VERSION = 0.5.1 +CATEGORIES = python +GARTYPE = v2 + +define BLURB +endef + +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +LICENSE_TEXT = This package is licensed under the MIT license + +PACKAGES += CSWpy-tempita +SPKG_DESC_CSWpy-tempita = A very small text templating language +# PKGFILES is catchall +ARCHALL_CSWpy-tempita = 1 + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/tempita/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/twisted/trunk/checksums 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/tempita/trunk/checksums 2013-10-16 15:20:17 UTC (rev 22233) @@ -1 +0,0 @@ -9a321b904d01efd695079f8484b37861 Twisted-12.2.0.tar.bz2 Copied: csw/mgar/pkg/lang-python/tempita/trunk/checksums (from rev 22207, csw/mgar/pkg/lang-python/twisted/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/tempita/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/tempita/trunk/checksums 2013-10-16 15:20:17 UTC (rev 22233) @@ -0,0 +1 @@ +f75bdfeabd2f3755f1ff32d582a574a4 Tempita-0.5.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 Wed Oct 16 17:29:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 15:29:42 +0000 Subject: SF.net SVN: gar:[22234] csw/mgar/pkg/lang-python Message-ID: Revision: 22234 http://gar.svn.sourceforge.net/gar/?rev=22234&view=rev Author: dmichelsen Date: 2013-10-16 15:29:41 +0000 (Wed, 16 Oct 2013) Log Message: ----------- lang-python/decorator: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/decorator/trunk/Makefile csw/mgar/pkg/lang-python/decorator/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/decorator/ Modified: csw/mgar/pkg/lang-python/decorator/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/tempita/trunk/Makefile 2013-10-16 15:20:17 UTC (rev 22233) +++ csw/mgar/pkg/lang-python/decorator/trunk/Makefile 2013-10-16 15:29:41 UTC (rev 22234) @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = Tempita -VERSION = 0.5.1 +NAME = decorator +VERSION = 3.4.0 CATEGORIES = python GARTYPE = v2 @@ -13,11 +13,9 @@ MASTER_SITES += $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.gz -LICENSE_TEXT = This package is licensed under the MIT license - -PACKAGES += CSWpy-tempita -SPKG_DESC_CSWpy-tempita = A very small text templating language +PACKAGES += CSWpy-decorator +SPKG_DESC_CSWpy-decorator = Better living through Python with decorators # PKGFILES is catchall -ARCHALL_CSWpy-tempita = 1 +ARCHALL_CSWpy-decorator = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/decorator/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/tempita/trunk/checksums 2013-10-16 15:20:17 UTC (rev 22233) +++ csw/mgar/pkg/lang-python/decorator/trunk/checksums 2013-10-16 15:29:41 UTC (rev 22234) @@ -1 +1 @@ -f75bdfeabd2f3755f1ff32d582a574a4 Tempita-0.5.1.tar.gz +1e8756f719d746e2fc0dd28b41251356 decorator-3.4.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 16 21:48:33 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 16 Oct 2013 19:48:33 +0000 Subject: SF.net SVN: gar:[22235] csw/mgar/pkg/silctoolkit/trunk/Makefile Message-ID: Revision: 22235 http://gar.svn.sourceforge.net/gar/?rev=22235&view=rev Author: lblume Date: 2013-10-16 19:48:33 +0000 (Wed, 16 Oct 2013) Log Message: ----------- silctoolkit/trunk: Put the headers in a separate subdir to avoid collisions Modified Paths: -------------- csw/mgar/pkg/silctoolkit/trunk/Makefile Modified: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-10-16 15:29:41 UTC (rev 22234) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2013-10-16 19:48:33 UTC (rev 22235) @@ -47,6 +47,9 @@ BUILD64 = 1 +# Avoid a collision between its client.h and Samba's +includedir = $(prefix)/include/silc + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-simdir=$(libdir)/silc 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 Oct 16 21:56:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 19:56:54 +0000 Subject: SF.net SVN: gar:[22236] csw/mgar/pkg Message-ID: Revision: 22236 http://gar.svn.sourceforge.net/gar/?rev=22236&view=rev Author: dmichelsen Date: 2013-10-16 19:56:54 +0000 (Wed, 16 Oct 2013) Log Message: ----------- buildbot-slave: Initial commit Added Paths: ----------- csw/mgar/pkg/buildbot-slave/ csw/mgar/pkg/buildbot-slave/trunk/Makefile csw/mgar/pkg/buildbot-slave/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/buildbot-slave/trunk/Makefile csw/mgar/pkg/buildbot-slave/trunk/checksums Deleted: csw/mgar/pkg/buildbot-slave/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-16 19:56:54 UTC (rev 22236) @@ -1,64 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = buildbot -VERSION = 0.7.12 -PATCHLEVEL = -CATEGORIES = python -GARTYPE = v2 - -DESCRIPTION = A system to automate the compile/test cycle -define BLURB - The BuildBot is a system to automate the compile/test cycle required by most - software projects to validate code changes. By automatically rebuilding and - testing the tree each time something has changed, build problems are - pinpointed quickly, before other developers are inconvenienced by the - failure. The guilty developer can be identified and harassed without human - intervention. By running the builds on a variety of platforms, developers who - do not have the facilities to test their changes everywhere before checkin - will at least know shortly afterwards whether they have broken the build or - not. Warning counts, lint checks, image size, compile time, and other build - parameters can be tracked over time, are more visible, and are therefore - easier to improve. -endef - -MASTER_SITES = $(SF_MIRROR) -PATCHFILES = buildbot-tail.patch -PATCHFILES += buildbot-debug.patch -DISTFILES = $(NAME)-$(VERSION)$(PATCHLEVEL).tar.gz $(PATCHFILES) - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -PYCOMPILE = 1 - -RUNTIME_DEP_PKGS += CSWcoreutils -RUNTIME_DEP_PKGS += CSWtwisted -RUNTIME_DEP_PKGS += CSWzope - -ARCHALL = 1 -CONFIGURE_SCRIPTS = -BUILD_SCRIPTS = buildbot -TEST_SCRIPTS = -INSTALL_SCRIPTS = buildbot - -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)$(PATCHLEVEL) - -CHECKPKG_OVERRIDES_CSWbuildbot += unidentified-dependency|CSWcoreutils -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWtwisted -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWzope -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils - -build-buildbot: - (cd $(WORKSRC); python setup.py build) - @$(MAKECOOKIE) - -install-buildbot: - (cd $(WORKSRC); python setup.py install --root=$(DESTDIR)) - @$(MAKECOOKIE) - -post-install-modulated: - gfind $(DESTDIR) -type f -name '*.pyc' -exec rm {} \; - @$(MAKECOOKIE) - -include gar/category.mk Copied: csw/mgar/pkg/buildbot-slave/trunk/Makefile (from rev 22214, csw/mgar/pkg/buildbot/trunk/Makefile) =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/Makefile (rev 0) +++ csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-16 19:56:54 UTC (rev 22236) @@ -0,0 +1,27 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = buildbot-slave +VERSION = 0.8.8 +CATEGORIES = python +GARTYPE = v2 + +DESCRIPTION = BuildBot Slave Daemon + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz + +PACKAGES += CSWbuildbot-slave +SPKG_DESC_CSWbuildbot-slave = BuildBot Slave Daemon +# PKGFILES is catchall +ARCHALL_CSWbuildbot-slave = 1 + +# This is more like an application than a python module +CHECKPKG_OVERRIDES_CSWbuildbot-slave += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWbuildbot-slave += catalogname-does-not-start-with-py_ + +# There seems to be 'trial' missing +SKIPTEST ?= 1 + +include gar/category.mk Deleted: csw/mgar/pkg/buildbot-slave/trunk/checksums =================================================================== --- csw/mgar/pkg/buildbot/trunk/checksums 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/buildbot-slave/trunk/checksums 2013-10-16 19:56:54 UTC (rev 22236) @@ -1,3 +0,0 @@ -5ba9559e2ef0d4e34a26815d95fc2d68 buildbot-0.7.12.tar.gz -4c70db04b3514157aa746370ad282eeb buildbot-debug.patch -a39720c9a13d73bbda054938d6a98c47 buildbot-tail.patch Copied: csw/mgar/pkg/buildbot-slave/trunk/checksums (from rev 22214, csw/mgar/pkg/buildbot/trunk/checksums) =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/checksums (rev 0) +++ csw/mgar/pkg/buildbot-slave/trunk/checksums 2013-10-16 19:56:54 UTC (rev 22236) @@ -0,0 +1 @@ +9854d1df35cb09a5320b30b76eefd9ba buildbot-slave-0.8.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Oct 16 22:05:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 20:05:39 +0000 Subject: SF.net SVN: gar:[22237] csw/mgar/pkg/lang-python/sqlalchemy/branches Message-ID: Revision: 22237 http://gar.svn.sourceforge.net/gar/?rev=22237&view=rev Author: dmichelsen Date: 2013-10-16 20:05:39 +0000 (Wed, 16 Oct 2013) Log Message: ----------- sqlalchemy-0.7.10: Make branch as specific version is needed for buildbot Modified Paths: -------------- csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/ csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile Deleted: csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile 2013-10-16 13:37:33 UTC (rev 22230) +++ csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile 2013-10-16 20:05:39 UTC (rev 22237) @@ -1,24 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# There are failing unit tests; the issue is submitted upstream: -# http://www.sqlalchemy.org/trac/ticket/1837 - -NAME = SQLAlchemy -VERSION = 0.8.2 -CATEGORIES = python - -PACKAGES = CSWpy-sqlalchemy -DESCRIPTION = Python SQL toolkit and Object Relational Mapper - -VENDOR_URL = http://www.sqlalchemy.org/ -DISTNAME = $(NAME)-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz -LICENSE = LICENSE - -RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-7-1-0 - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile (from rev 22231, csw/mgar/pkg/lang-python/sqlalchemy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/Makefile 2013-10-16 20:05:39 UTC (rev 22237) @@ -0,0 +1,25 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# There are failing unit tests; the issue is submitted upstream: +# http://www.sqlalchemy.org/trac/ticket/1837 + +NAME = SQLAlchemy +VERSION = 0.7.10 +CATEGORIES = python + +DISTNAME = $(NAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.sqlalchemy.org/ +LICENSE = LICENSE + +PACKAGES += CSWpy-sqlalchemy +SPKG_DESC_CSWpy-sqlalchemy = Python SQL toolkit and Object Relational Mapper +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-sqlalchemy += CSWlibpython2-7-1-0 + +include gar/category.mk Modified: csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/checksums =================================================================== --- csw/mgar/pkg/lang-python/sqlalchemy/trunk/checksums 2013-10-16 13:37:33 UTC (rev 22230) +++ csw/mgar/pkg/lang-python/sqlalchemy/branches/sqlalchemy-0.7.10/checksums 2013-10-16 20:05:39 UTC (rev 22237) @@ -1 +1 @@ -5a33fb43dea93468dbb2a6562ee80b54 SQLAlchemy-0.8.2.tar.gz +ecc0cd1cd906d17818a5f08fe13ae19e SQLAlchemy-0.7.10.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 Oct 16 22:06:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 20:06:47 +0000 Subject: SF.net SVN: gar:[22238] csw/mgar/pkg/buildbot/trunk/Makefile Message-ID: Revision: 22238 http://gar.svn.sourceforge.net/gar/?rev=22238&view=rev Author: dmichelsen Date: 2013-10-16 20:06:47 +0000 (Wed, 16 Oct 2013) Log Message: ----------- buildbot/trunk: Add dependencies Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-16 20:05:39 UTC (rev 22237) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-16 20:06:47 UTC (rev 22238) @@ -30,9 +30,10 @@ PACKAGES += CSWbuildbot SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle # PKGFILES is catchall -RUNTIME_DEP_PKGSbuildbot += CSWcoreutils -RUNTIME_DEP_PKGSbuildbot += CSWpy-twisted -RUNTIME_DEP_PKGSbuildbot += CSWpy-zope-interface +RUNTIME_DEP_PKGS_CSWbuildbot += CSWcoreutils +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-twisted +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- 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 Oct 16 22:09:49 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 16 Oct 2013 20:09:49 +0000 Subject: SF.net SVN: gar:[22239] csw/mgar/pkg/buildbot/trunk/Makefile Message-ID: Revision: 22239 http://gar.svn.sourceforge.net/gar/?rev=22239&view=rev Author: dmichelsen Date: 2013-10-16 20:09:49 +0000 (Wed, 16 Oct 2013) Log Message: ----------- buildbot/trunk: Add overrides Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-16 20:06:47 UTC (rev 22238) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-16 20:09:49 UTC (rev 22239) @@ -35,6 +35,11 @@ RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface + # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWbuildbot += catalogname-does-not-start-with-py_ 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 Oct 16 23:14:06 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Oct 2013 21:14:06 +0000 Subject: SF.net SVN: gar:[22240] csw/mgar/pkg/lang-python/formencode/trunk Message-ID: Revision: 22240 http://gar.svn.sourceforge.net/gar/?rev=22240&view=rev Author: wahwah Date: 2013-10-16 21:14:06 +0000 (Wed, 16 Oct 2013) Log Message: ----------- lang-python/formencode/trunk: Upgrade to 1.2.6 Modified Paths: -------------- csw/mgar/pkg/lang-python/formencode/trunk/Makefile csw/mgar/pkg/lang-python/formencode/trunk/checksums Modified: csw/mgar/pkg/lang-python/formencode/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2013-10-16 20:09:49 UTC (rev 22239) +++ csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2013-10-16 21:14:06 UTC (rev 22240) @@ -3,24 +3,24 @@ # $Id$ NAME = FormEncode -VERSION = 1.2.2 +VERSION = 1.2.6 CATEGORIES = python GARTYPE = v2 DESCRIPTION = A validation and form generation package -define BLURB -endef -DL_NAME = FormEncode -DISTNAME = $(DL_NAME)-$(VERSION) + SPKG_SOURCEURL = http://formencode.org/ -MASTER_SITES = http://pypi.python.org/packages/source/F/FormEncode/ PACKAGES = CSWpy-formencode -CATALOGNAME_CSWpy-formencode = py_formencode -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -LICENSE = PKG-INFO + +DISTFILES = $(NAME)-$(VERSION).zip ARCHALL_CSWpy-formencode = 1 +DEP_PKGS += CSWpy-dns +DEP_PKGS += CSWpy-country + REINPLACE_USRSHARE = $(SITE_PACKAGES)/formencode/api.py REINPLACE_WHEN_USRSHARE = postinstall +CHECKPKG_OVERRIDES_CSWpy-formencode += surplus-dependency|CSWpy-country +CHECKPKG_OVERRIDES_CSWpy-formencode += surplus-dependency|CSWpy-dns + include gar/category.mk Modified: csw/mgar/pkg/lang-python/formencode/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/checksums 2013-10-16 20:09:49 UTC (rev 22239) +++ csw/mgar/pkg/lang-python/formencode/trunk/checksums 2013-10-16 21:14:06 UTC (rev 22240) @@ -1 +1 @@ -da23d54af521d1feab12b4caf30e3111 FormEncode-1.2.2.tar.gz +c9d51fcfdaf5c2480963930ef0167575 FormEncode-1.2.6.zip 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 Oct 17 01:13:10 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Oct 2013 23:13:10 +0000 Subject: SF.net SVN: gar:[22241] csw/mgar/pkg/lang-python Message-ID: Revision: 22241 http://gar.svn.sourceforge.net/gar/?rev=22241&view=rev Author: wahwah Date: 2013-10-16 23:13:10 +0000 (Wed, 16 Oct 2013) Log Message: ----------- py_itsdangerous: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/itsdangerous/ csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums Deleted: csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile 2013-10-16 23:13:10 UTC (rev 22241) @@ -1,26 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = FormEncode -VERSION = 1.2.2 -CATEGORIES = python -GARTYPE = v2 -DESCRIPTION = A validation and form generation package -define BLURB -endef -DL_NAME = FormEncode -DISTNAME = $(DL_NAME)-$(VERSION) -SPKG_SOURCEURL = http://formencode.org/ -MASTER_SITES = http://pypi.python.org/packages/source/F/FormEncode/ -PACKAGES = CSWpy-formencode -CATALOGNAME_CSWpy-formencode = py_formencode -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -LICENSE = PKG-INFO -ARCHALL_CSWpy-formencode = 1 - -REINPLACE_USRSHARE = $(SITE_PACKAGES)/formencode/api.py -REINPLACE_WHEN_USRSHARE = postinstall - -include gar/category.mk Copied: csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile (from rev 22240, csw/mgar/pkg/lang-python/formencode/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile 2013-10-16 23:13:10 UTC (rev 22241) @@ -0,0 +1,18 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = itsdangerous +VERSION = 0.23 +CATEGORIES = python +GARTYPE = v2 +DESCRIPTION = Various helpers to pass trusted data to untrusted environments and back + +VENDOR_URL = https://pypi.python.org/pypi/itsdangerous + +DISTFILES = $(NAME)-$(VERSION).tar.gz + +PACKAGES = CSWpy-itsdangerous +ARCHALL_CSWpy-itsdangerous = 1 + +include gar/category.mk Deleted: csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/checksums 2013-10-06 16:45:22 UTC (rev 22140) +++ csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums 2013-10-16 23:13:10 UTC (rev 22241) @@ -1 +0,0 @@ -da23d54af521d1feab12b4caf30e3111 FormEncode-1.2.2.tar.gz Copied: csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums (from rev 22240, csw/mgar/pkg/lang-python/formencode/trunk/checksums) =================================================================== --- csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums 2013-10-16 23:13:10 UTC (rev 22241) @@ -0,0 +1 @@ +985e726eb76f18aca81e703f0a6c6efc itsdangerous-0.23.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 Oct 17 01:24:00 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 16 Oct 2013 23:24:00 +0000 Subject: SF.net SVN: gar:[22242] csw/mgar/pkg Message-ID: Revision: 22242 http://gar.svn.sourceforge.net/gar/?rev=22242&view=rev Author: wahwah Date: 2013-10-16 23:24:00 +0000 (Wed, 16 Oct 2013) Log Message: ----------- hachoir: Removing the hachoir package from the catalog. Removed Paths: ------------- csw/mgar/pkg/hachoir-core/ csw/mgar/pkg/hachoir-parser/ 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 Oct 17 09:28:40 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 17 Oct 2013 07:28:40 +0000 Subject: SF.net SVN: gar:[22243] csw/mgar/pkg/lang-python Message-ID: Revision: 22243 http://gar.svn.sourceforge.net/gar/?rev=22243&view=rev Author: wahwah Date: 2013-10-17 07:28:40 +0000 (Thu, 17 Oct 2013) Log Message: ----------- py_werkzeug: The test suite doesn't pass Modified Paths: -------------- csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile csw/mgar/pkg/lang-python/werkzeug/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/werkzeug/ Modified: csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/itsdangerous/trunk/Makefile 2013-10-16 23:13:10 UTC (rev 22241) +++ csw/mgar/pkg/lang-python/werkzeug/trunk/Makefile 2013-10-17 07:28:40 UTC (rev 22243) @@ -2,17 +2,17 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = itsdangerous -VERSION = 0.23 +NAME = Werkzeug +VERSION = 0.9.4 CATEGORIES = python GARTYPE = v2 -DESCRIPTION = Various helpers to pass trusted data to untrusted environments and back +DESCRIPTION = The Swiss Army knife of Python web development -VENDOR_URL = https://pypi.python.org/pypi/itsdangerous +VENDOR_URL = https://pypi.python.org/pypi/Werkzeug DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWpy-itsdangerous -ARCHALL_CSWpy-itsdangerous = 1 +PACKAGES = CSWpy-werkzeug +ARCHALL_CSWpy-werkzeug = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/werkzeug/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/itsdangerous/trunk/checksums 2013-10-16 23:13:10 UTC (rev 22241) +++ csw/mgar/pkg/lang-python/werkzeug/trunk/checksums 2013-10-17 07:28:40 UTC (rev 22243) @@ -1 +1 @@ -985e726eb76f18aca81e703f0a6c6efc itsdangerous-0.23.tar.gz +670fad41f57c13b71a6816765765a3dd Werkzeug-0.9.4.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 Fri Oct 18 09:54:34 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 18 Oct 2013 07:54:34 +0000 Subject: SF.net SVN: gar:[22244] csw/mgar/pkg/lang-python/cython/trunk Message-ID: Revision: 22244 http://gar.svn.sourceforge.net/gar/?rev=22244&view=rev Author: wahwah Date: 2013-10-18 07:54:34 +0000 (Fri, 18 Oct 2013) Log Message: ----------- lang-python/cython/trunk: Upgrade to 0.19.2 Modified Paths: -------------- csw/mgar/pkg/lang-python/cython/trunk/Makefile csw/mgar/pkg/lang-python/cython/trunk/checksums Modified: csw/mgar/pkg/lang-python/cython/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cython/trunk/Makefile 2013-10-17 07:28:40 UTC (rev 22243) +++ csw/mgar/pkg/lang-python/cython/trunk/Makefile 2013-10-18 07:54:34 UTC (rev 22244) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = Cython -VERSION = 0.18 +VERSION = 0.19.2 DESCRIPTION = Cython Compiler define BLURB Modified: csw/mgar/pkg/lang-python/cython/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/cython/trunk/checksums 2013-10-17 07:28:40 UTC (rev 22243) +++ csw/mgar/pkg/lang-python/cython/trunk/checksums 2013-10-18 07:54:34 UTC (rev 22244) @@ -1 +1 @@ -6a72d14e72f3df597b34ac326152f8d2 Cython-0.18.tar.gz +4af1218346510b464c0a6bf15500d0e2 Cython-0.19.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 Fri Oct 18 16:41:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Oct 2013 14:41:42 +0000 Subject: SF.net SVN: gar:[22245] csw/mgar/pkg Message-ID: Revision: 22245 http://gar.svn.sourceforge.net/gar/?rev=22245&view=rev Author: dmichelsen Date: 2013-10-18 14:41:38 +0000 (Fri, 18 Oct 2013) Log Message: ----------- libmetalink/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libmetalink/ csw/mgar/pkg/libmetalink/Makefile csw/mgar/pkg/libmetalink/branches/ csw/mgar/pkg/libmetalink/tags/ csw/mgar/pkg/libmetalink/trunk/ csw/mgar/pkg/libmetalink/trunk/Makefile csw/mgar/pkg/libmetalink/trunk/checksums csw/mgar/pkg/libmetalink/trunk/files/ csw/mgar/pkg/libmetalink/trunk/files/0001-Do-not-use-Wall-unconditionally.patch csw/mgar/pkg/libmetalink/trunk/files/0002-Add-definition-of-INT32_MIN.patch csw/mgar/pkg/libmetalink/trunk/files/0003-Use-pkgconfig-for-expat-libs.patch csw/mgar/pkg/libmetalink/trunk/files/0153-bzr-commit-153.patch csw/mgar/pkg/libmetalink/trunk/files/0154-bzr-commit-154.patch csw/mgar/pkg/libmetalink/trunk/files/153 csw/mgar/pkg/libmetalink/trunk/files/154 Added: csw/mgar/pkg/libmetalink/Makefile =================================================================== --- csw/mgar/pkg/libmetalink/Makefile (rev 0) +++ csw/mgar/pkg/libmetalink/Makefile 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libmetalink/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libmetalink/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmetalink/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/Makefile 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,43 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libmetalink +VERSION = 0.1.2 +GARTYPE = v2 + +DESCRIPTION = A library to add Metalink functionality + +MASTER_SITES = https://launchpad.net/libmetalink/trunk/packagingfix/+download/ +DISTFILES += $(DISTNAME).tar.bz2 + +# Important bzr revisions after release of 0.1.2 from +# https://code.launchpad.net/~metalink-dev/libmetalink/trunk +PATCHFILES += 0153-bzr-commit-153.patch +PATCHFILES += 0154-bzr-commit-154.patch + +# Use patch until this is fixed: +# https://bugs.launchpad.net/libmetalink/+bug/1241633 +PATCHFILES += 0001-Do-not-use-Wall-unconditionally.patch + +# Use patch until this is fixed: +# https://bugs.launchpad.net/libmetalink/+bug/1241635 +PATCHFILES += 0002-Add-definition-of-INT32_MIN.patch + +# Use patch until this is fixed: +# https://bugs.launchpad.net/libmetalink/+bug/1241639 +PATCHFILES += 0003-Use-pkgconfig-for-expat-libs.patch + +PACKAGES += CSWlibmetalink3 +SPKG_DESC_CSWlibmetalink3 = A library to add Metalink functionality, libmetalink.so.3 +PKGFILES_CSWlibmetalink3 += $(call pkgfiles_lib,libmetalink.so.3) +RUNTIME_DEP_PKGS_CSWlibmetalink3 += CSWlibexpat1 + +PACKAGES += CSWlibmetalink-dev +SPKG_DESC_CSWlibmetalink-dev = Development files for libmetalink.so.3 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmetalink-dev += CSWlibmetalink3 + +BUILD64 = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/libmetalink/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libmetalink/trunk/checksums =================================================================== --- csw/mgar/pkg/libmetalink/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/checksums 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1 @@ +e60ea56d910ebfe4c303808db497e92a libmetalink-0.1.2.tar.bz2 Added: csw/mgar/pkg/libmetalink/trunk/files/0001-Do-not-use-Wall-unconditionally.patch =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/0001-Do-not-use-Wall-unconditionally.patch (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/0001-Do-not-use-Wall-unconditionally.patch 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,38 @@ +From c2cf1158df6fc56ad2dca6e9d58bb92be93fad36 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 15:38:54 +0200 +Subject: [PATCH] Do not use -Wall unconditionally + +--- + doc/examples/Makefile.in | 2 +- + lib/Makefile.in | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in +index cd3ba53..bec3757 100644 +--- a/doc/examples/Makefile.in ++++ b/doc/examples/Makefile.in +@@ -228,7 +228,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes ++AM_CPPFLAGS = -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes + LDADD = $(top_builddir)/lib/libmetalink.la + metalinkcat_SOURCES = metalinkcat.c + EXTRA_DIST = LibO_3.5.4_Win_x86_install_multi.msi.meta4 \ +diff --git a/lib/Makefile.in b/lib/Makefile.in +index c3438eb..1849da7 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -328,7 +328,6 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = includes +-AM_CFLAGS = -Wall + AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \ + @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \ + @DEFS@ +-- +1.8.3.4 + Added: csw/mgar/pkg/libmetalink/trunk/files/0002-Add-definition-of-INT32_MIN.patch =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/0002-Add-definition-of-INT32_MIN.patch (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/0002-Add-definition-of-INT32_MIN.patch 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,25 @@ +From 5ddb8ae66e212ce2dfcb46a39dea91c0c12ce81d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 15:54:24 +0200 +Subject: [PATCH] Add definition of INT32_MIN + +--- + lib/timegm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/timegm.c b/lib/timegm.c +index dced800..fb4cb88 100644 +--- a/lib/timegm.c ++++ b/lib/timegm.c +@@ -29,6 +29,8 @@ + + #include + ++#define INT32_MIN (~ INT32_MAX) ++ + /* Counter the number of leap year in the range [0, y). The |y| is the + year, including century (e.g., 2012) */ + static int count_leap_year(int y) +-- +1.8.3.4 + Added: csw/mgar/pkg/libmetalink/trunk/files/0003-Use-pkgconfig-for-expat-libs.patch =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/0003-Use-pkgconfig-for-expat-libs.patch (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/0003-Use-pkgconfig-for-expat-libs.patch 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,25 @@ +From a97f1c4bf7bc6b1df79d21bd5dc7a1dd765665c5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 15:59:00 +0200 +Subject: [PATCH] Use pkgconfig for expat libs + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 7f2dc88..2e8afb8 100755 +--- a/configure ++++ b/configure +@@ -12079,7 +12079,7 @@ if test "x$have_libexpat" = "xyes"; then + + $as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h + +- EXPAT_LIBS=-lexpat ++ EXPAT_LIBS=`/opt/csw/bin/pkg-config --libs expat` + EXPAT_CFLAGS= + + +-- +1.8.3.4 + Added: csw/mgar/pkg/libmetalink/trunk/files/0153-bzr-commit-153.patch =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/0153-bzr-commit-153.patch (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/0153-bzr-commit-153.patch 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,57 @@ +From b39da20e9b2dc145ba19dfca0a6b951afc71aa52 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 16:26:52 +0200 +Subject: [PATCH 153/154] bzr commit #153 + +--- + lib/metalink_pstm.c | 1 + + lib/metalink_session_data.c | 1 + + lib/metalink_string_buffer.c | 7 +++++++ + 3 files changed, 9 insertions(+) + +diff --git a/lib/metalink_pstm.c b/lib/metalink_pstm.c +index 1bcc9c2..efa29e9 100644 +--- a/lib/metalink_pstm.c ++++ b/lib/metalink_pstm.c +@@ -35,6 +35,7 @@ metalink_pstm_t* new_metalink_pstm(void) + if(!stm) { + return NULL; + } ++ stm->state = NULL; + stm->ctrl = new_metalink_pctrl(); + if(!stm->ctrl) { + goto NEW_METALINK_PSTM_ERROR; +diff --git a/lib/metalink_session_data.c b/lib/metalink_session_data.c +index 54377f9..6d616c8 100644 +--- a/lib/metalink_session_data.c ++++ b/lib/metalink_session_data.c +@@ -33,6 +33,7 @@ metalink_session_data_t* metalink_session_data_new(void) + if(!sd) { + return NULL; + } ++ sd->characters_stack = NULL; + sd->stm = new_metalink_pstm(); + if(!sd->stm) { + goto NEW_SESSION_DATA_ERROR; +diff --git a/lib/metalink_string_buffer.c b/lib/metalink_string_buffer.c +index 114579b..6405ae1 100644 +--- a/lib/metalink_string_buffer.c ++++ b/lib/metalink_string_buffer.c +@@ -31,7 +31,14 @@ + metalink_string_buffer_t* metalink_string_buffer_new(size_t initial_capacity) + { + metalink_string_buffer_t* sbuf = malloc(sizeof(metalink_string_buffer_t)); ++ if(!sbuf) { ++ return NULL; ++ } + sbuf->buffer = calloc(sizeof(char), initial_capacity+1); ++ if(!sbuf->buffer) { ++ free(sbuf); ++ return NULL; ++ } + sbuf->length = 0; + sbuf->buffer[sbuf->length] = '\0'; + sbuf->capacity = initial_capacity; +-- +1.8.3.4 + Added: csw/mgar/pkg/libmetalink/trunk/files/0154-bzr-commit-154.patch =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/0154-bzr-commit-154.patch (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/0154-bzr-commit-154.patch 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,38 @@ +From 08e4cb277db7cfb9a6456167d1c3d0200ad16f8f Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 16:27:37 +0200 +Subject: [PATCH 154/154] bzr commit #154 + +--- + configure.ac | 4 +++- + doc/examples/metalinkcat.c | 7 +++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/doc/examples/metalinkcat.c b/doc/examples/metalinkcat.c +index 8bb7c21..081a41e 100644 +--- a/doc/examples/metalinkcat.c ++++ b/doc/examples/metalinkcat.c +@@ -51,7 +51,9 @@ int main(int argc, char** argv) + file = metalink->files[0]; + printf("name: %s\n", file->name); + printf("size: %" PRId64 "\n", (int64_t)file->size); +- printf("os : %s\n", file->os); ++ if(file->os) { ++ printf("os : %s\n", file->os); ++ } + + if(file->checksums) { + checksums = file->checksums; +@@ -82,7 +84,8 @@ int main(int argc, char** argv) + resources = file->resources; + while(*resources && count < 5) { + printf("type=%s, location=%s, preference=%d, url=%s\n", +- (*resources)->type, (*resources)->location, ++ (*resources)->type ? (*resources)->type : "", ++ (*resources)->location ? (*resources)->location : "", + (*resources)->preference, (*resources)->url); + ++resources; + ++count; +-- +1.8.3.4 + Added: csw/mgar/pkg/libmetalink/trunk/files/153 =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/153 (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/153 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,43 @@ +=== modified file 'lib/metalink_pstm.c' +--- lib/metalink_pstm.c 2012-06-30 10:17:09 +0000 ++++ lib/metalink_pstm.c 2013-01-25 14:52:14 +0000 +@@ -35,6 +35,7 @@ + if(!stm) { + return NULL; + } ++ stm->state = NULL; + stm->ctrl = new_metalink_pctrl(); + if(!stm->ctrl) { + goto NEW_METALINK_PSTM_ERROR; + +=== modified file 'lib/metalink_session_data.c' +--- lib/metalink_session_data.c 2012-06-30 10:17:09 +0000 ++++ lib/metalink_session_data.c 2013-01-25 14:52:14 +0000 +@@ -33,6 +33,7 @@ + if(!sd) { + return NULL; + } ++ sd->characters_stack = NULL; + sd->stm = new_metalink_pstm(); + if(!sd->stm) { + goto NEW_SESSION_DATA_ERROR; + +=== modified file 'lib/metalink_string_buffer.c' +--- lib/metalink_string_buffer.c 2012-06-30 10:17:09 +0000 ++++ lib/metalink_string_buffer.c 2013-01-25 14:52:14 +0000 +@@ -31,7 +31,14 @@ + metalink_string_buffer_t* metalink_string_buffer_new(size_t initial_capacity) + { + metalink_string_buffer_t* sbuf = malloc(sizeof(metalink_string_buffer_t)); ++ if(!sbuf) { ++ return NULL; ++ } + sbuf->buffer = calloc(sizeof(char), initial_capacity+1); ++ if(!sbuf->buffer) { ++ free(sbuf); ++ return NULL; ++ } + sbuf->length = 0; + sbuf->buffer[sbuf->length] = '\0'; + sbuf->capacity = initial_capacity; + Added: csw/mgar/pkg/libmetalink/trunk/files/154 =================================================================== --- csw/mgar/pkg/libmetalink/trunk/files/154 (rev 0) +++ csw/mgar/pkg/libmetalink/trunk/files/154 2013-10-18 14:41:38 UTC (rev 22245) @@ -0,0 +1,40 @@ +=== modified file 'configure.ac' +--- configure.ac 2012-08-29 15:28:07 +0000 ++++ configure.ac 2013-01-28 16:17:56 +0000 +@@ -43,7 +43,9 @@ + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ;; +- ++ *-*solaris*) ++ CFLAGS="-std=gnu99 -D_XOPEN_SOURCE=600 $CFLAGS" ++ ;; + *) + ;; + esac + +=== modified file 'doc/examples/metalinkcat.c' +--- doc/examples/metalinkcat.c 2012-07-02 12:46:19 +0000 ++++ doc/examples/metalinkcat.c 2013-01-28 16:17:56 +0000 +@@ -51,7 +51,9 @@ + file = metalink->files[0]; + printf("name: %s\n", file->name); + printf("size: %" PRId64 "\n", (int64_t)file->size); +- printf("os : %s\n", file->os); ++ if(file->os) { ++ printf("os : %s\n", file->os); ++ } + + if(file->checksums) { + checksums = file->checksums; +@@ -82,7 +84,8 @@ + resources = file->resources; + while(*resources && count < 5) { + printf("type=%s, location=%s, preference=%d, url=%s\n", +- (*resources)->type, (*resources)->location, ++ (*resources)->type ? (*resources)->type : "", ++ (*resources)->location ? (*resources)->location : "", + (*resources)->preference, (*resources)->url); + ++resources; + ++count; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Oct 18 17:09:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 18 Oct 2013 15:09:57 +0000 Subject: SF.net SVN: gar:[22246] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 22246 http://gar.svn.sourceforge.net/gar/?rev=22246&view=rev Author: lblume Date: 2013-10-18 15:09:54 +0000 (Fri, 18 Oct 2013) Log Message: ----------- Enable/adjust GCC4 options to use in different ISAs Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-10-18 14:41:38 UTC (rev 22245) +++ csw/mgar/gar/v2/gar.conf.mk 2013-10-18 15:09:54 UTC (rev 22246) @@ -237,7 +237,7 @@ ARCHFLAGS_SOS12U2_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused ARCHFLAGS_SOS12U3_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR - ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR + ARCHFLAGS_GCC4_sparcv9+fmuladd = -m64 -mcpu=ultrasparc3 -mfmaf -Wa,-xarch=v9b MEMORYMODEL_sparcv9+fmuladd = 64 ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b @@ -246,7 +246,7 @@ ARCHFLAGS_SOS12U2_sparcv9+vis2 = -m64 -xarch=sparcvis2 ARCHFLAGS_SOS12U3_sparcv9+vis2 = -m64 -xarch=sparcvis2 ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR - ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR + ARCHFLAGS_GCC4_sparcv9+vis2 = -m64 -mcpu=ultrasparc3 -mvis2 -Wa,-xarch=v9b MEMORYMODEL_sparcv9+vis2 = 64 ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a @@ -255,7 +255,7 @@ ARCHFLAGS_SOS12U2_sparcv9+vis = -m64 -xarch=sparcvis ARCHFLAGS_SOS12U3_sparcv9+vis = -m64 -xarch=sparcvis ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis - ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis + ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis -Wa,-xarch=v9a MEMORYMODEL_sparcv9+vis = 64 ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 @@ -264,7 +264,7 @@ ARCHFLAGS_SOS12U2_sparcv9 = -m64 -xarch=sparc ARCHFLAGS_SOS12U3_sparcv9 = -m64 -xarch=sparc ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9 - ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 + ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 -Wa,-xarch=v9 MEMORYMODEL_sparcv9 = 64 ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR @@ -273,7 +273,7 @@ ARCHFLAGS_SOS12U2_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused ARCHFLAGS_SOS12U3_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR - ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR + ARCHFLAGS_GCC4_sparcv8plus+fmuladd = -mcpu=v9 -mfmaf -Wa,-xarch=v8plusb MEMORYMODEL_sparcv8plus+fmuladd = 32 ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb @@ -282,7 +282,7 @@ ARCHFLAGS_SOS12U2_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 ARCHFLAGS_SOS12U3_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR - ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR + ARCHFLAGS_GCC4_sparcv8plus+vis2 = -mcpu=v9 -mvis2 -Wa,-xarch=v8plusb MEMORYMODEL_sparcv8plus+vis2 = 32 ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa @@ -291,7 +291,7 @@ ARCHFLAGS_SOS12U2_sparcv8plus+vis = -m32 -xarch=sparcvis ARCHFLAGS_SOS12U3_sparcv8plus+vis = -m32 -xarch=sparcvis ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis - ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis + ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v9 -mvis -Wa,-xarch=v8plusa MEMORYMODEL_sparcv8plus+vis = 32 ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus @@ -300,7 +300,7 @@ ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_SOS12U3_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus - ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 + ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v9 -Wa,-xarch=v8plus MEMORYMODEL_sparcv8plus = 32 ARCHFLAGS_SOS11_sparcv8 = -xarch=v8 @@ -309,7 +309,7 @@ ARCHFLAGS_SOS12U2_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_SOS12U3_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8 - ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8 + ARCHFLAGS_GCC4_sparcv8 = -mcpu=v9 -Wa,-xarch=v8plus MEMORYMODEL_sparcv8 = 32 ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a 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 Oct 18 17:23:35 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Oct 2013 15:23:35 +0000 Subject: SF.net SVN: gar:[22247] csw/mgar/pkg/buildbot/trunk/Makefile Message-ID: Revision: 22247 http://gar.svn.sourceforge.net/gar/?rev=22247&view=rev Author: dmichelsen Date: 2013-10-18 15:23:35 +0000 (Fri, 18 Oct 2013) Log Message: ----------- buildbot/trunk: Add missing dependencies Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-18 15:09:54 UTC (rev 22246) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-18 15:23:35 UTC (rev 22247) @@ -34,11 +34,17 @@ RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-twisted RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-jinja2 +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-tempita +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-decorator CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-jinja2 +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-tempita +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-decorator # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- 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 Oct 18 17:38:49 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Oct 2013 15:38:49 +0000 Subject: SF.net SVN: gar:[22248] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 22248 http://gar.svn.sourceforge.net/gar/?rev=22248&view=rev Author: dmichelsen Date: 2013-10-18 15:38:47 +0000 (Fri, 18 Oct 2013) Log Message: ----------- libcurl4/trunk: Update to 7.33.0 and add metalink support Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile csw/mgar/pkg/libcurl4/trunk/checksums Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 15:23:35 UTC (rev 22247) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 15:38:47 UTC (rev 22248) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.32.0 +VERSION = 7.33.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers @@ -28,6 +28,7 @@ BUILD_DEP_PKGS += CSWlibfbopenssl-dev BUILD_DEP_PKGS += CSWlibrtmp-dev BUILD_DEP_PKGS += CSWlibidn-dev +BUILD_DEP_PKGS += CSWlibmetalink-dev PACKAGES += CSWlibcurl4 CATALOGNAME_CSWlibcurl4 = libcurl4 @@ -81,7 +82,8 @@ RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1 #RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 -#RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3 EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = minimal full @@ -95,6 +97,7 @@ EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir) EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps +EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink # Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet EXTRA_LDFLAGS = -L$(libdir)/libnet-new @@ -123,10 +126,12 @@ EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) -MERGE_SCRIPTS_isa-default-features-minimal = copy-all +# Make sure to pick the "curl" binary from features-full as e.g. metalink support is only in the binary +# and not libmetalink +MERGE_SCRIPTS_isa-default-features-minimal = copy-only MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only copy-config-only MERGE_DIRS_isa-default64-features-minimal = $(libdir) -MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_SCRIPTS_isa-default-features-full = copy-all MERGE_DIRS_isa-default-features-full = $(libdir) MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only MERGE_DIRS_isa-default64-features-full = $(libdir) Modified: csw/mgar/pkg/libcurl4/trunk/checksums =================================================================== --- csw/mgar/pkg/libcurl4/trunk/checksums 2013-10-18 15:23:35 UTC (rev 22247) +++ csw/mgar/pkg/libcurl4/trunk/checksums 2013-10-18 15:38:47 UTC (rev 22248) @@ -1 +1 @@ -db5948f44e7ef3edbf9a7907af9556ac curl-7.32.0.tar.lzma +eb463192f37c260163e006d6c4d3f114 curl-7.33.0.tar.lzma 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 Oct 18 18:47:21 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Oct 2013 16:47:21 +0000 Subject: SF.net SVN: gar:[22249] csw/mgar/pkg/libcurl4/trunk Message-ID: Revision: 22249 http://gar.svn.sourceforge.net/gar/?rev=22249&view=rev Author: dmichelsen Date: 2013-10-18 16:47:19 +0000 (Fri, 18 Oct 2013) Log Message: ----------- libcurl4/trunk: Add patch for failing test, more are still failing, ignore for now Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 15:38:47 UTC (rev 22248) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 16:47:19 UTC (rev 22249) @@ -16,6 +16,10 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES += $(NAME)-$(VERSION).tar.lzma +# Use patch until this is fixed: +# http://sourceforge.net/p/curl/bugs/1291/ +PATCHFILES += 0001-Add-patch-from-bug-1291.patch + VENDOR_URL = http://curl.haxx.se # Because of OpenSSL 1.0 update @@ -113,7 +117,7 @@ BUILD64 = 1 # There are some failing tests, ignore for now -# SKIPTEST ?= 1 +SKIPTEST ?= 1 # We do special 32/64 merging for this one, see post-merge EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h Added: csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch =================================================================== --- csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch (rev 0) +++ csw/mgar/pkg/libcurl4/trunk/files/0001-Add-patch-from-bug-1291.patch 2013-10-18 16:47:19 UTC (rev 22249) @@ -0,0 +1,26 @@ +From 8faa296be2f98a26456a5b8e73cb3baaa6f6b9ab Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 18 Oct 2013 17:44:40 +0200 +Subject: [PATCH] Add patch from bug #1291 + +--- + tests/data/test906 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/data/test906 b/tests/data/test906 +index 5072e90..6cf6bed 100644 +--- a/tests/data/test906 ++++ b/tests/data/test906 +@@ -41,6 +41,9 @@ mail body + + smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt recipient at example.com --mail-from sender at example.com -u testuser:testpass -T - + ++ ++chkhostname curlhost ++ + + + # +-- +1.8.3.4 + 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 Oct 18 22:54:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 18 Oct 2013 20:54:22 +0000 Subject: SF.net SVN: gar:[22250] csw/mgar/pkg/libcurl4/trunk/Makefile Message-ID: Revision: 22250 http://gar.svn.sourceforge.net/gar/?rev=22250&view=rev Author: dmichelsen Date: 2013-10-18 20:54:21 +0000 (Fri, 18 Oct 2013) Log Message: ----------- libcurl4/trunk: Fix MERGE_DIRS Modified Paths: -------------- csw/mgar/pkg/libcurl4/trunk/Makefile Modified: csw/mgar/pkg/libcurl4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 16:47:19 UTC (rev 22249) +++ csw/mgar/pkg/libcurl4/trunk/Makefile 2013-10-18 20:54:21 UTC (rev 22250) @@ -133,10 +133,10 @@ # Make sure to pick the "curl" binary from features-full as e.g. metalink support is only in the binary # and not libmetalink MERGE_SCRIPTS_isa-default-features-minimal = copy-only +MERGE_DIRS_isa-default-features-minimal = $(libdir) MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only copy-config-only MERGE_DIRS_isa-default64-features-minimal = $(libdir) MERGE_SCRIPTS_isa-default-features-full = copy-all -MERGE_DIRS_isa-default-features-full = $(libdir) MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only MERGE_DIRS_isa-default64-features-full = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Oct 18 22:58:09 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 18 Oct 2013 20:58:09 +0000 Subject: SF.net SVN: gar:[22251] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 22251 http://gar.svn.sourceforge.net/gar/?rev=22251&view=rev Author: lblume Date: 2013-10-18 20:58:09 +0000 (Fri, 18 Oct 2013) Log Message: ----------- v8 should have stayed v8, it's for S9 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-10-18 20:54:21 UTC (rev 22250) +++ csw/mgar/gar/v2/gar.conf.mk 2013-10-18 20:58:09 UTC (rev 22251) @@ -309,7 +309,7 @@ ARCHFLAGS_SOS12U2_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_SOS12U3_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8 - ARCHFLAGS_GCC4_sparcv8 = -mcpu=v9 -Wa,-xarch=v8plus + ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8 MEMORYMODEL_sparcv8 = 32 ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a 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 Oct 19 12:34:23 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 10:34:23 +0000 Subject: SF.net SVN: gar:[22252] csw/mgar/pkg/rcs/trunk Message-ID: Revision: 22252 http://gar.svn.sourceforge.net/gar/?rev=22252&view=rev Author: dmichelsen Date: 2013-10-19 10:34:19 +0000 (Sat, 19 Oct 2013) Log Message: ----------- rcs/trunk: Update to 5.9.1 Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile csw/mgar/pkg/rcs/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2013-10-18 20:58:09 UTC (rev 22251) +++ csw/mgar/pkg/rcs/trunk/Makefile 2013-10-19 10:34:19 UTC (rev 22252) @@ -1,16 +1,23 @@ NAME = rcs -VERSION = 5.8 +VERSION = 5.9.1 GARTYPE = v2 DESCRIPTION = GNU Revision Control System define BLURB endef -MASTER_SITES = http://www.cs.purdue.edu/homes/trinkle/RCS/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.xz +PATCHFILES += 0001-sh-bails-out-if-returncode-of-grep-is-1.patch + +VENDOR_URL = http://www.gnu.org/software/rcs/ + +PACKAGES += CSWrcs +SPKG_DESC_CSWrcs = GNU Revision Control System +# PKGFILES is catchall # We need this for gdiff and gdiff3 -RUNTIME_DEP_PKGS = CSWdiffutils +RUNTIME_DEP_PKGS_CSWrcs = CSWdiffutils CHECKPKG_OVERRIDES_CSWrcs += surplus-dependency|CSWdiffutils DIFF = $(bindir)/gdiff Modified: csw/mgar/pkg/rcs/trunk/checksums =================================================================== --- csw/mgar/pkg/rcs/trunk/checksums 2013-10-18 20:58:09 UTC (rev 22251) +++ csw/mgar/pkg/rcs/trunk/checksums 2013-10-19 10:34:19 UTC (rev 22252) @@ -1 +1 @@ -c0fa1f3528418cee83b7e6e06fc87957 rcs-5.8.tar.gz +43af6f4cce2c42bb4572691bb97e4396 rcs-5.9.1.tar.xz Added: csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch =================================================================== --- csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch (rev 0) +++ csw/mgar/pkg/rcs/trunk/files/0001-sh-bails-out-if-returncode-of-grep-is-1.patch 2013-10-19 10:34:19 UTC (rev 22252) @@ -0,0 +1,26 @@ +From 8b9b824d11f30e7944dc664e7f3d4cbace871196 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 19 Oct 2013 12:22:27 +0200 +Subject: [PATCH] sh bails out if returncode of grep is 1 + +--- + build-aux/extract-help | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + mode change 100755 => 100644 build-aux/extract-help + +diff --git a/build-aux/extract-help b/build-aux/extract-help +index a360e1c..7a2d33d +--- a/build-aux/extract-help ++++ b/build-aux/extract-help +@@ -87,7 +87,7 @@ echo 'static char const' $vprefix'help[] = ""' + echo ';' + + # Pull in command support only if needed. +-if [ 0 = `grep -c 'CHECK_HV (".*")' "$in"` ] ; then ++if [ 0 = `grep -c 'CHECK_HV (".*")' "$in";true` ] ; then + echo '#include "b-yacmd.h"' + fi + +-- +1.8.3.4 + 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 Oct 19 12:57:43 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 10:57:43 +0000 Subject: SF.net SVN: gar:[22253] csw/mgar/pkg/mutt/trunk Message-ID: Revision: 22253 http://gar.svn.sourceforge.net/gar/?rev=22253&view=rev Author: dmichelsen Date: 2013-10-19 10:57:43 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mutt/trunk: Update to 1.5.22 Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile csw/mgar/pkg/mutt/trunk/checksums Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2013-10-19 10:34:19 UTC (rev 22252) +++ csw/mgar/pkg/mutt/trunk/Makefile 2013-10-19 10:57:43 UTC (rev 22253) @@ -1,5 +1,5 @@ NAME = mutt -VERSION = 1.5.21 +VERSION = 1.5.22 GARTYPE = v2 EXTRA_MODULATORS = SLANG @@ -42,6 +42,8 @@ # This warning from checkpkg is obviously wrong... CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl +# This is just a comment +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/etc/opt/csw/Muttrc.CSW PACKAGES += CSWmutt-ncurses SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface @@ -50,9 +52,8 @@ RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibidn11 RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWgpgme RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWmutt-base @@ -64,28 +65,14 @@ RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibslang2 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWgpgme RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibtokyocabinet9 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibidn11 RUNTIME_DEP_PKGS_CSWmutt-slang += CSWmutt-base CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/etc/opt/csw/Muttrc.CSW -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/reference.html -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/ChangeLog -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/INSTALL -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/configuration.html -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/samples/sample.muttrc -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/share|root/opt/csw/share/doc/mutt/devel-notes.txt -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/mimesupport.html -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.txt -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.html -CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/muttrc.5 -CHECKPKG_OVERRIDES_CSWmutt-base += pkginfo-opencsw-repository-uncommitted - REINPLACEMENTS += mailcap REINPLACE_MATCH_mailcap = /usr/local/etc/mailcap REINPLACE_WITH_mailcap = /opt/csw/etc/mailcap @@ -97,6 +84,10 @@ # http://dev.mutt.org/trac/ticket/3347 OPT_FLAGS_SOS = -xO4 +# Needed to use stdbool.h, add manually until this is fixed: +# http://dev.mutt.org/trac/ticket/3657 +EXTRA_CPPFLAGS += -xc99=all + sysconfdir = /etc/opt/csw CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mutt/trunk/checksums =================================================================== --- csw/mgar/pkg/mutt/trunk/checksums 2013-10-19 10:34:19 UTC (rev 22252) +++ csw/mgar/pkg/mutt/trunk/checksums 2013-10-19 10:57:43 UTC (rev 22253) @@ -1 +1 @@ -a29db8f1d51e2f10c070bf88e8a553fd mutt-1.5.21.tar.gz +48267aba1bc53db636777f4a1ec87cb6 mutt-1.5.22.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 19 14:09:41 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 19 Oct 2013 12:09:41 +0000 Subject: SF.net SVN: gar:[22254] csw/mgar/pkg/mplayer/branches Message-ID: Revision: 22254 http://gar.svn.sourceforge.net/gar/?rev=22254&view=rev Author: pfelecan Date: 2013-10-19 12:09:41 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: instantiation Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/ csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums csw/mgar/pkg/mplayer/branches/snapshot/files/ Added: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 12:09:41 UTC (rev 22254) @@ -0,0 +1,112 @@ +# $Id$ + +NAME = mplayer +YEAR = $(shell date '+%Y') +MONTH = $(shell date '+%m') +DAY = $(shell date '+%d') +VERSION = $(YEAR)$(MONTH)$(DAY) +GARTYPE = v2 + +DESCRIPTION = The Movie Player and Encoder +define BLURB + + MPlayer can play most standard video formats out of the box and + almost all others with the help of external codecs. MPlayer + currently works best from the command line, but visual feedback + for many functions is available from its onscreen status display + (OSD), which is also used for displaying subtitles. MPlayer also + has a GUI with skin support and several unofficial alternative + graphical frontends are available. + + MEncoder is a command line video encoder for advanced users that + can be built from the MPlayer source tree. Unofficial graphical + frontends exist but are not included. +endef + +MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/ +MASTER_SITES += http://ffmpeg.org/releases/ +DISTFILES = $(NAME)-export-snapshot.tar.bz2 +DISTFILES += ffmpeg-snapshot.tar.bz2 +DISTNAME = $(NAME)-export-$(YEAR)-$(MONTH)-$(DAY) +PATCHFILES += 0001-configure-uses-bash.patch +PATCHFILES += 0002-version-uses-bash.patch + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +BUILD_DEP_PKGS += CSWfaac +BUILD_DEP_PKGS += CSWfontconfig-dev +BUILD_DEP_PKGS += CSWliba52 +BUILD_DEP_PKGS += CSWlibaa-dev +BUILD_DEP_PKGS += CSWlibdvdcss-dev +BUILD_DEP_PKGS += CSWlibdvdnav-dev +BUILD_DEP_PKGS += CSWlibdvdread-dev +BUILD_DEP_PKGS += CSWlibfaad-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibgif-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWliblz-dev +BUILD_DEP_PKGS += CSWliblzo-dev +BUILD_DEP_PKGS += CSWlibmad-dev +BUILD_DEP_PKGS += CSWlibmp3lame-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWliboggz-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibsdl-dev +BUILD_DEP_PKGS += CSWlibspeex-dev +BUILD_DEP_PKGS += CSWlibtheora-dev +BUILD_DEP_PKGS += CSWlibx264-dev +BUILD_DEP_PKGS += CSWlibxvidcore-dev +BUILD_DEP_PKGS += CSWmesa +BUILD_DEP_PKGS += CSWmpg123 +BUILD_DEP_PKGS += CSWnas +BUILD_DEP_PKGS += CSWunrar +BUILD_DEP_PKGS += CSWlibxmms-dev +BUILD_DEP_PKGS += CSWyasm + +GARCOMPILER = GNU + +# 2 packages: mplayer, mencoder; separate recipe for codec, fonts and +# skin + +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom +TEST_SCRIPTS = custom + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +post-extract: + cd $(WORKSRC) && \ + mv ../ffmpeg ffmpeg + $(MAKECOOKIE) + +# configure is not configure ! +# must use internal dvdnav as our library is not a snapshot +configure-custom: + cd $(WORKSRC) && \ + ./configure \ + --cc=gcc \ + --host-cc=gcc \ + --extra-cflags='-std=gnu99' \ + --extra-ldflags='-lrt' \ + --enable-runtime-cpudetection \ + --prefix=$(prefix) \ + --codecsdir=$(libexecdir)/mplayer + $(MAKECOOKIE) + +build-custom: + cd $(WORKSRC) && \ + $(MAKE) + $(MAKECOOKIE) + +test-custom: +ifdef testData + cd $(WORKSRC) && \ + [ -d $(testData) ] && \ + $(MAKE) FATE_SAMPLES=$(testData) fatetest +endif + $(MAKECOOKIE) Added: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-19 12:09:41 UTC (rev 22254) @@ -0,0 +1,2 @@ +b0351fd5b37a6cc8ab2c3c28f5374bb5 ffmpeg-snapshot.tar.bz2 +7fcab3e59e1e757bf972d3b0bb4e4db7 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 19 14:11:31 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 19 Oct 2013 12:11:31 +0000 Subject: SF.net SVN: gar:[22255] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22255 http://gar.svn.sourceforge.net/gar/?rev=22255&view=rev Author: pfelecan Date: 2013-10-19 12:11:31 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: builds but have issue with unexpected man dependency Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 12:09:41 UTC (rev 22254) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 12:11:31 UTC (rev 22255) @@ -75,6 +75,32 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer += CSWnas + 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 dmichelsen at users.sourceforge.net Sat Oct 19 15:44:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 13:44:10 +0000 Subject: SF.net SVN: gar:[22256] csw/mgar/pkg/lang-python Message-ID: Revision: 22256 http://gar.svn.sourceforge.net/gar/?rev=22256&view=rev Author: dmichelsen Date: 2013-10-19 13:44:10 +0000 (Sat, 19 Oct 2013) Log Message: ----------- lang-python/pyasn1: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/pyasn1/trunk/Makefile csw/mgar/pkg/lang-python/pyasn1/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/pyasn1/ Removed Paths: ------------- csw/mgar/pkg/lang-python/pyasn1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/pyasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/pyasn1/trunk/Makefile 2013-10-19 13:44:10 UTC (rev 22256) @@ -1,34 +1,20 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -# * pyconfig.h (via "Python.h") unconditionally sets _FILE_OFFSET_BITS = 64. -# "/opt/csw/include/python2.6/pyconfig.h", line 1016: warning: macro redefined: _FILE_OFFSET_BITS -# -# * setup.py unconditionally passes gcc flags -# cc: Warning: illegal option -d=c99 -# cc: Warning: illegal option -fomit-frame-pointer -# -NAME = pycrypto -VERSION = 2.6 +NAME = pyasn1 +VERSION = 0.1.7 GARTYPE = v2 CATEGORIES = python -DESCRIPTION = The Python Cryptography Toolkit -define BLURB - The Python cryptography toolkit is intended to provide a reliable and - stable base for writing Python programs that require cryptographic - functions. -endef +DESCRIPTION = ASN.1 types and codecs -MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ -DISTFILES = $(DISTNAME).tar.gz -LICENSE = COPYRIGHT -PACKAGES = CSWpy-crypto +MASTER_SITES += $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz -BUILD_DEP_PACKAGES += CSWlibgmp-dev +PACKAGES += CSWpy-asn1 +SPKG_DESC_CSWpy-asn = ASN.1 types and codecs +# PKGFILES is catchall +ARCHALL_CSWpy-asn1 = 1 -RUNTIME_DEP_PKGS = CSWlibgmp10 -RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 - include gar/category.mk Modified: csw/mgar/pkg/lang-python/pyasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/pyasn1/trunk/checksums 2013-10-19 13:44:10 UTC (rev 22256) @@ -1 +1 @@ -270d1fe83a39e0467a66a22bb files/pycrypto-2.6.tar.gz +2cbd80fcd4c7b1c82180d3d76fee18c8 pyasn1-0.1.7.tar.gz Deleted: csw/mgar/pkg/lang-python/pyasn1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW 2013-10-01 09:31:28 UTC (rev 22069) +++ csw/mgar/pkg/lang-python/pyasn1/trunk/files/changelog.CSW 2013-10-19 13:44:10 UTC (rev 22256) @@ -1,5 +0,0 @@ -pycrypto (2.3,REV=2011.06.18) - - * Initial release. - - -- Sebastian Kayser Sat, 18 Jun 2011 14:05:18 +0200 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 19 15:51:52 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 19 Oct 2013 13:51:52 +0000 Subject: SF.net SVN: gar:[22257] csw/mgar/pkg/mplayer/branches/snapshot/files Message-ID: Revision: 22257 http://gar.svn.sourceforge.net/gar/?rev=22257&view=rev Author: pfelecan Date: 2013-10-19 13:51:52 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: add 2 patches Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/files/0001-configure-uses-bash.patch csw/mgar/pkg/mplayer/branches/snapshot/files/0002-version-uses-bash.patch Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0001-configure-uses-bash.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0001-configure-uses-bash.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0001-configure-uses-bash.patch 2013-10-19 13:51:52 UTC (rev 22257) @@ -0,0 +1,22 @@ +From d230c38db7bcad8063f7597ff2569ceccc938e0f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 16 Oct 2013 19:06:15 +0200 +Subject: [PATCH] configure uses bash + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 72f8ee5..f284646 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/bin/env bash + # + # Original version (C) 2000 Pontscho/fresh!mindworkz + # pontscho at makacs.poliod.hu +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0002-version-uses-bash.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0002-version-uses-bash.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0002-version-uses-bash.patch 2013-10-19 13:51:52 UTC (rev 22257) @@ -0,0 +1,22 @@ +From c684fab9ad172ac202c468b95fecca7e6176e90a Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 17 Oct 2013 10:25:57 +0200 +Subject: [PATCH] version uses bash + +--- + version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/version.sh b/version.sh +index ab9b8e8..0114248 100755 +--- a/version.sh ++++ b/version.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env bash + + test "$1" && extra="-$1" + +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 19 17:07:08 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 19 Oct 2013 15:07:08 +0000 Subject: SF.net SVN: gar:[22258] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22258 http://gar.svn.sourceforge.net/gar/?rev=22258&view=rev Author: pfelecan Date: 2013-10-19 15:07:08 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: new run-time dependencies Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Property Changed: ---------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 13:51:52 UTC (rev 22257) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 15:07:08 UTC (rev 22258) @@ -75,31 +75,34 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 -RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac -RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 -RUNTIME_DEP_PKGS_CSWmplayer += CSWnas +RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer += CSWnas include gar/category.mk Property changes on: csw/mgar/pkg/mplayer/branches/snapshot/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Oct 19 17:38:13 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 19 Oct 2013 15:38:13 +0000 Subject: SF.net SVN: gar:[22259] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22259 http://gar.svn.sourceforge.net/gar/?rev=22259&view=rev Author: pfelecan Date: 2013-10-19 15:38:13 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: SCM must ignores some components Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Property Changed: ---------------- csw/mgar/pkg/mplayer/branches/snapshot/ Property changes on: csw/mgar/pkg/mplayer/branches/snapshot ___________________________________________________________________ Added: svn:ignore + work nohup.out Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 15:07:08 UTC (rev 22258) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 15:38:13 UTC (rev 22259) @@ -78,7 +78,6 @@ RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 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 Oct 19 19:20:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 17:20:10 +0000 Subject: SF.net SVN: gar:[22260] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 22260 http://gar.svn.sourceforge.net/gar/?rev=22260&view=rev Author: dmichelsen Date: 2013-10-19 17:20:10 +0000 (Sat, 19 Oct 2013) Log Message: ----------- mGAR v2: Fix setup.py test target Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-10-19 15:38:13 UTC (rev 22259) +++ csw/mgar/gar/v2/gar.lib.mk 2013-10-19 17:20:10 UTC (rev 22260) @@ -994,7 +994,6 @@ test-%/setup.py: @echo " ==> Running setup.py test in $*" - @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) $(PYTHON_EXECUTABLE) ./setup.py $(PYTHON_TEST_TARGET) $(TEST_ARGS) ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Oct 19 19:24:36 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 17:24:36 +0000 Subject: SF.net SVN: gar:[22261] csw/mgar/pkg/lang-python/pycrypto/trunk Message-ID: Revision: 22261 http://gar.svn.sourceforge.net/gar/?rev=22261&view=rev Author: dmichelsen Date: 2013-10-19 17:24:35 +0000 (Sat, 19 Oct 2013) Log Message: ----------- lang-python/pycrypto/trunk: Update to 2.6.1 and cleanup Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile csw/mgar/pkg/lang-python/pycrypto/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 17:20:10 UTC (rev 22260) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 17:24:35 UTC (rev 22261) @@ -10,7 +10,7 @@ # NAME = pycrypto -VERSION = 2.6 +VERSION = 2.6.1 GARTYPE = v2 CATEGORIES = python @@ -22,13 +22,18 @@ endef MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ -DISTFILES = $(DISTNAME).tar.gz -LICENSE = COPYRIGHT -PACKAGES = CSWpy-crypto +DISTFILES += $(DISTNAME).tar.gz +LICENSE = COPYRIGHT + BUILD_DEP_PACKAGES += CSWlibgmp-dev -RUNTIME_DEP_PKGS = CSWlibgmp10 -RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +PACKAGES += CSWpy-crypto +SPKG_DESC_CSWpy-crypte = The Python Cryptography Toolkit +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpy-crypto += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpy-crypto += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWpy-crypto += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-crypto += CSWlibpython2-7-1-0 include gar/category.mk Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2013-10-19 17:20:10 UTC (rev 22260) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2013-10-19 17:24:35 UTC (rev 22261) @@ -1 +1 @@ -270d1fe83a39e0467a66a22bb files/pycrypto-2.6.tar.gz +55a61a054aa66812daf5161a0d5d7eda pycrypto-2.6.1.tar.gz Deleted: csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW 2013-10-19 17:20:10 UTC (rev 22260) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/changelog.CSW 2013-10-19 17:24:35 UTC (rev 22261) @@ -1,5 +0,0 @@ -pycrypto (2.3,REV=2011.06.18) - - * Initial release. - - -- Sebastian Kayser Sat, 18 Jun 2011 14:05:18 +0200 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 Oct 19 22:07:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 20:07:10 +0000 Subject: SF.net SVN: gar:[22262] csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Message-ID: Revision: 22262 http://gar.svn.sourceforge.net/gar/?rev=22262&view=rev Author: dmichelsen Date: 2013-10-19 20:07:09 +0000 (Sat, 19 Oct 2013) Log Message: ----------- lang-python/pycrypto/trunk: No more Solaris 9 due to missing sem_open Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 17:24:35 UTC (rev 22261) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 20:07:09 UTC (rev 22262) @@ -26,6 +26,9 @@ LICENSE = COPYRIGHT +# We must have sem_open and this is only available in Python for Solaris 10 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + BUILD_DEP_PACKAGES += CSWlibgmp-dev PACKAGES += CSWpy-crypto 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 Oct 19 23:06:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 19 Oct 2013 21:06:06 +0000 Subject: SF.net SVN: gar:[22263] csw/mgar/pkg/lang-python/pycrypto/trunk Message-ID: Revision: 22263 http://gar.svn.sourceforge.net/gar/?rev=22263&view=rev Author: dmichelsen Date: 2013-10-19 21:06:06 +0000 (Sat, 19 Oct 2013) Log Message: ----------- lang-python/pycrypto/trunk: Work around missing sem_open on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-Allow-testing-when-sem_open-does-not-exist.-See-http.patch Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 20:07:09 UTC (rev 22262) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2013-10-19 21:06:06 UTC (rev 22263) @@ -24,11 +24,12 @@ MASTER_SITES = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/ DISTFILES += $(DISTNAME).tar.gz +# Make sure to skip test when sem_open is not available. Use patch until this is fixed: +# https://github.com/dlitz/pycrypto/pull/61 +PATCHFILES += 0001-Allow-testing-when-sem_open-does-not-exist.-See-http.patch + LICENSE = COPYRIGHT -# We must have sem_open and this is only available in Python for Solaris 10 -PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc - BUILD_DEP_PACKAGES += CSWlibgmp-dev PACKAGES += CSWpy-crypto Added: csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-Allow-testing-when-sem_open-does-not-exist.-See-http.patch =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-Allow-testing-when-sem_open-does-not-exist.-See-http.patch (rev 0) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-Allow-testing-when-sem_open-does-not-exist.-See-http.patch 2013-10-19 21:06:06 UTC (rev 22263) @@ -0,0 +1,29 @@ +From 289eff0caf5199cf95308a6b9ab3c558da800ebe Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Sat, 19 Oct 2013 22:56:33 +0200 +Subject: [PATCH] Allow testing when sem_open does not exist. See + https://github.com/dlitz/pycrypto/pull/61 + +--- + lib/Crypto/SelfTest/Random/test__UserFriendlyRNG.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/Crypto/SelfTest/Random/test__UserFriendlyRNG.py b/lib/Crypto/SelfTest/Random/test__UserFriendlyRNG.py +index 771a663..3fd7ad4 100644 +--- a/lib/Crypto/SelfTest/Random/test__UserFriendlyRNG.py ++++ b/lib/Crypto/SelfTest/Random/test__UserFriendlyRNG.py +@@ -39,6 +39,11 @@ from Crypto.Util.py3compat import * + + try: + import multiprocessing ++ # multiprocessing.Pool uses classes from multiprocessing.synchronize, so we ++ # need to check if multiprocessing.semaphore will work. Otherwise creating a ++ # multiprocessing.Pool instance will fail with an ImportError. See Python ++ # bug #3770 for details. ++ import multiprocessing.synchronize + except ImportError: + multiprocessing = None + +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Oct 20 19:36:22 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 20 Oct 2013 17:36:22 +0000 Subject: SF.net SVN: gar:[22264] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22264 http://gar.svn.sourceforge.net/gar/?rev=22264&view=rev Author: pfelecan Date: 2013-10-20 17:36:19 +0000 (Sun, 20 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: - new dependencies (build and run-time) - override - new snapshot Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-19 21:06:06 UTC (rev 22263) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-20 17:36:19 UTC (rev 22264) @@ -38,11 +38,13 @@ BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWliba52 BUILD_DEP_PKGS += CSWlibaa-dev +BUILD_DEP_PKGS += CSWlibaudiofile-dev BUILD_DEP_PKGS += CSWlibdvdcss-dev BUILD_DEP_PKGS += CSWlibdvdnav-dev BUILD_DEP_PKGS += CSWlibdvdread-dev BUILD_DEP_PKGS += CSWlibfaad-dev BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibfribidi-dev BUILD_DEP_PKGS += CSWlibgif-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibjpeg-dev @@ -54,6 +56,7 @@ BUILD_DEP_PKGS += CSWlibogg-dev BUILD_DEP_PKGS += CSWliboggz-dev BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibrtmp-dev BUILD_DEP_PKGS += CSWlibsdl-dev BUILD_DEP_PKGS += CSWlibspeex-dev BUILD_DEP_PKGS += CSWlibtheora-dev @@ -78,6 +81,7 @@ RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 @@ -103,6 +107,62 @@ RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 RUNTIME_DEP_PKGS_CSWmplayer += CSWnas +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.62 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng12.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbis.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaa.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudio.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudiofile.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libbz2.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libesd.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libjpeg.so.62 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libpng12.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvorbis.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvorbisenc.so.2 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-19 21:06:06 UTC (rev 22263) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-20 17:36:19 UTC (rev 22264) @@ -1,2 +1,2 @@ -b0351fd5b37a6cc8ab2c3c28f5374bb5 ffmpeg-snapshot.tar.bz2 -7fcab3e59e1e757bf972d3b0bb4e4db7 mplayer-export-snapshot.tar.bz2 +62027ac188ad0abc7a85516f6a34be47 ffmpeg-snapshot.tar.bz2 +14c9ada9e8a6e70410bcfc9c0f5ef157 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Oct 20 19:46:47 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 20 Oct 2013 17:46:47 +0000 Subject: SF.net SVN: gar:[22265] csw/mgar/pkg/mplayer/branches/snapshot/checksums Message-ID: Revision: 22265 http://gar.svn.sourceforge.net/gar/?rev=22265&view=rev Author: pfelecan Date: 2013-10-20 17:46:47 +0000 (Sun, 20 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: new snapshot Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-20 17:36:19 UTC (rev 22264) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-20 17:46:47 UTC (rev 22265) @@ -1,2 +1,2 @@ -62027ac188ad0abc7a85516f6a34be47 ffmpeg-snapshot.tar.bz2 +8dbeee35114533293f840474fc9072e3 ffmpeg-snapshot.tar.bz2 14c9ada9e8a6e70410bcfc9c0f5ef157 mplayer-export-snapshot.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Oct 20 22:20:37 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Oct 2013 20:20:37 +0000 Subject: SF.net SVN: gar:[22266] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 22266 http://gar.svn.sourceforge.net/gar/?rev=22266&view=rev Author: wahwah Date: 2013-10-20 20:20:36 +0000 (Sun, 20 Oct 2013) Log Message: ----------- csw-upload-pkg: Add a comment about matching pkgs Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-10-20 17:46:47 UTC (rev 22265) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2013-10-20 20:20:36 UTC (rev 22266) @@ -164,6 +164,10 @@ osrel = file_metadata['osrel'] arch = file_metadata['arch'] metadata_by_md5[md5_sum] = file_metadata + # TODO(unassigned): The problem is that the assignment can (should) also + # depend on other packages in the same batch. This function shouldn't + # really take a single package as an argument, but a group of packages. + # Or it should not return ready assignments, but weights instead. catalogs = self._MatchSrv4ToCatalogs( filename, self.catrel, arch, osrel, md5_sum) for unused_catrel, cat_arch, cat_osrel in catalogs: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Oct 20 23:04:11 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 20 Oct 2013 21:04:11 +0000 Subject: SF.net SVN: gar:[22267] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22267 http://gar.svn.sourceforge.net/gar/?rev=22267&view=rev Author: pfelecan Date: 2013-10-20 21:04:08 +0000 (Sun, 20 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: condition automatic CPU detection on architecture Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-20 20:20:36 UTC (rev 22266) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-20 21:04:08 UTC (rev 22267) @@ -174,6 +174,13 @@ # configure is not configure ! # must use internal dvdnav as our library is not a snapshot + +ifneq ($(GARCH),sparc) +CPU_DETECTION =--enable-runtime-cpudetection +else +CPU_DETECTION = +endif + configure-custom: cd $(WORKSRC) && \ ./configure \ @@ -181,7 +188,7 @@ --host-cc=gcc \ --extra-cflags='-std=gnu99' \ --extra-ldflags='-lrt' \ - --enable-runtime-cpudetection \ + $(CPU_DETECTION) \ --prefix=$(prefix) \ --codecsdir=$(libexecdir)/mplayer $(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 Mon Oct 21 00:07:10 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 20 Oct 2013 22:07:10 +0000 Subject: SF.net SVN: gar:[22268] csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Message-ID: Revision: 22268 http://gar.svn.sourceforge.net/gar/?rev=22268&view=rev Author: wahwah Date: 2013-10-20 22:07:09 +0000 (Sun, 20 Oct 2013) Log Message: ----------- find_obsolete_pkgs: Remove trailing whitespace Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Modified: csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2013-10-20 21:04:08 UTC (rev 22267) +++ csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2013-10-20 22:07:09 UTC (rev 22268) @@ -4,7 +4,7 @@ - Which packages need rebuilding (so they don't depend on the _stub any more) - Which _stub packages can be removed - Which packages can declare incompatibility on the old packages, so that the old packages can be removed - + set PYTHONPATH=/path/to/.buildsys/v2 alternatively can used: sys.path.append('/path/to/.buildsys/v2') @@ -12,7 +12,7 @@ - read the sub hint from catalog * if stub has consumer -> rebuild * if stub has no consumer and the stub is present in the old/"from" catalog -> remove - * if stub has no consumer and the stub does not yet present in the old/"from" catalog -> keep + * if stub has no consumer and the stub does not yet present in the old/"from" catalog -> keep ''' import optparse @@ -42,7 +42,7 @@ fn_removelst = 'PkgsToRemoveFrom_%s_%s_%s.lst' fn_rebuildlst = 'PkgsToRebuildFrom_%s_%s_%s.lst' revdeplst = {} - + CatSubSet = namedtuple('CatSubSet','catalogname md5_sum version dependlist') class CompCatalog(object): @@ -52,7 +52,7 @@ self.catrel = name self.arch = arch self.osrel = osrel - + def __getCat(self, name,arch,osrel): ''' get dependcy list from catalog, read cached list if available ''' catlst = {} @@ -73,37 +73,37 @@ fd.write(cjson.encode(catlst)) logger.info('CompCatalog::getCat: write cache file: %s' % (fn_cat % (name,osrel,arch))) return catlst - + def getCatalog(self): return self.__getCat(self.catrel,self.arch,self.osrel) def processCat(catrel,arch,osrel): revdeplst = {} - + logger.info("processCat: -> %s %s %s" % (catrel, arch, osrel)) cc = CompCatalog(catrel,arch,osrel) catlst = cc.getCatalog() logger.info("processCat: iterate on %s" % (catrel)) - + ''' build reverse dependency list ''' rd = RevDeps() for p in catlst.keys(): revdeplst[p] = rd.RevDepsByPkg(catrel,arch,osrel,p) - + logger.info("processCat: <- %s %s %s" % (catrel, arch, osrel)) return catlst, revdeplst - + def main(): parser = optparse.OptionParser() parser.add_option("--debug", dest="debug", action="store_true") parser.add_option("--verbose", dest="verbose", action="store_true") - parser.add_option("--to-catalog-release", dest="newcatalog", default='kiel', + parser.add_option("--to-catalog-release", dest="newcatalog", default='kiel', help='set name of catalog to fetch', metavar = 'catalogname') - parser.add_option("--from-catalog-release", dest="oldcatalog", default='dublin', + parser.add_option("--from-catalog-release", dest="oldcatalog", default='dublin', help='set name of previous (older) catalog to fetch', metavar = 'old catalogname') - parser.add_option("--os-arch", dest="arch", default='i386', + parser.add_option("--os-arch", dest="arch", default='i386', help='set name of architecture (sparc|i386) to fetch', metavar = 'OS Architecture') - parser.add_option("--os-release", dest="osrel", default='SunOS5.10', + parser.add_option("--os-release", dest="osrel", default='SunOS5.10', help='set os release to fetch (SunOS5.10|SunOS5.11)', metavar = 'OS Release') options, args = parser.parse_args() opterror = False @@ -126,17 +126,17 @@ else: logger.error('unknown architecture: %s',options.arch) opterror = True - if options.osrel in common_constants.OS_RELS: + if options.osrel in common_constants.OS_RELS: osrel = options.osrel else: logger.error('unknown OS Release: %s',options.osrel) opterror = True if opterror: sys.exit(1) - + newcatlst, newrevdeplst = processCat(newcatrel,arch,osrel) oldcatlst, oldrevdeplst = processCat(oldcatrel,arch,osrel) - + to_remove_candidates = [] rebuildlst = [] logger.debug(' process dependecies in %s' % newcatrel) @@ -164,15 +164,15 @@ logger.info(" DROP : %s from %s" % (p,newcatrel)) else: logger.info(" KEEP : {0} not a _stub package in {1}".format(p,oldcatrel)) - - print ('write %s' % (fn_removelst % (newcatrel,osrel,arch))) + + print ('write %s' % (fn_removelst % (newcatrel,osrel,arch))) rmcnt = 0 with open(fn_removelst % (newcatrel,osrel,arch), "w") as fd: for rp in reallyremovelst: fd.write(CatSubSet(*newcatlst[rp]).catalogname+'\n') rmcnt = rmcnt + 1 logger.info("packages to remove: %d" % rmcnt) - print ('write %s' % (fn_rebuildlst % (newcatrel,osrel,arch))) + print ('write %s' % (fn_rebuildlst % (newcatrel,osrel,arch))) rbcnt = 0 with open(fn_rebuildlst % (newcatrel,osrel,arch), "w") as fd: for rp in rebuildlst: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Oct 21 10:39:16 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 21 Oct 2013 08:39:16 +0000 Subject: SF.net SVN: gar:[22269] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22269 http://gar.svn.sourceforge.net/gar/?rev=22269&view=rev Author: lblume Date: 2013-10-21 08:39:15 +0000 (Mon, 21 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Various changes for a GCC4 optimized build 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 2013-10-20 22:07:09 UTC (rev 22268) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-21 08:39:15 UTC (rev 22269) @@ -21,13 +21,14 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -# Use newest Sun Studio on Solaris10 to solve problems on Solaris10 x86 -# 64bit build: +# Keep Studio 12.0 for old S9 only ifneq ($(shell /usr/bin/uname -r),5.9) - GARCOMPILER = SOS12U3 + GARCOMPILER = GCC4 + # Try to get some more oomph out of a sparc + EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9+vis2 endif # There is some assembler code, which doesn't work on sparcv8, and I don't see @@ -52,36 +53,52 @@ # Those options follow those of the Solaris 11 build # https://java.net/projects/solaris-userland/sources/gate/show/components/mysql-5-1?rev=1502 -EXTRA_CXXFLAGS_64 += -features=no%except +#EXTRA_CXXFLAGS_64 += -features=no%except # Required at -xO4 # https://java.net/projects/solaris-userland/sources/gate/content/make-rules/shared-macros.mk?rev=1505` -EXTRA_CFLAGS_sparc += -xregs=no%appl +#EXTRA_CFLAGS_sparc += -xregs=no%appl +EXTRA_CFLAGS_sparc += -mno-app-regs EXTRA_CFLAGS_i386 += -xregs=no%frameptr -EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) -EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +#EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) +#EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +EXTRA_CFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CXXFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) # The Solaris 11 build uses -xO4 by default -OPT_FLAGS_SOS_32 = -xO4 -OPT_FLAGS_SOS_64 = -xO4 -OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s -OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s -OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) +#OPT_FLAGS_SOS_32 = -xO4 +#OPT_FLAGS_SOS_64 = -xO4 +#OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s +#OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s +#OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(ISA)) +OPT_FLAGS_GCC4_32 = -O3 +OPT_FLAGS_GCC4_64 = -O3 +OPT_FLAGS_GCC4 += $(OPT_FLAGS_GCC4_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(ISA)) INITSMF = $(sysconfdir)/init\.d/csw$(NAME) MYSQL_LIB_VER = 18 -MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) +# Ensure that the install directories match the ISA name so +# the scripts will work as expected +bindir = $(abspath $(bindir_install)/$(ISABINDIR)) +sbindir = $(abspath $(sbindir_install)/$(ISABINDIR)) +libexecdir = $(abspath $(libexecdir_install)/$(ISABINDIR)) +# The daemon to launch is selected by script, should not be automatic +# Some other files too should probably not be isaexec'd +EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/libexec/mysqld +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/my_print_defaults +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess.conf + PATCHFILES += 0003-I-HATE-CMAKE.patch PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch # https://java.net/projects/solaris-userland/sources/gate/content/components/mysql-5-1/patches/xO4_optimization.patch?rev=1502 PATCHFILES += 0004-xO4-fix.patch -PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) @@ -95,12 +112,14 @@ PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* +PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) 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)_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibgcc-s1 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -137,6 +156,8 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we @@ -156,6 +177,10 @@ RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL)) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 + CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME) += no-direct-binding|/opt/csw/libexec/mysqld|is|not|directly|bound|to|soname|libmtmalloc.so.1 @@ -176,6 +201,7 @@ BUILD64_5.9_i386 = BUILD64_5.10_i386 = 1 BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH)) +ISAEXEC = 1 MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ MASTER_SITES += http://mysql.skynet.be/Downloads/MySQL-$(BASE_VERSION)/ @@ -329,11 +355,11 @@ post-configure-modulated: gsed \ - -e 's+ at prefix@+$(prefix)+g' \ - -e 's+ at localstatedir@+$(localstatedir)/$(NAME)+g' \ - -e 's+ at sysconfdir@+$(sysconfdir)+g' \ - -e 's+ at bindir@+$(bindir)+g' \ - -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ + -e 's|@prefix@|$(prefix)|g' \ + -e 's|@localstatedir@|$(localstatedir)/$(NAME)|g' \ + -e 's|@sysconfdir@|$(sysconfdir)|g' \ + -e 's|@bindir@|$(bindir)|g' \ + -e 's|@BASE_VERSION@|$(BASE_VERSION)|g' \ < $(WORKDIR)/csw$(NAME).tpl \ > $(WORKDIR)/csw$(NAME) @$(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 Oct 21 11:08:39 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 21 Oct 2013 09:08:39 +0000 Subject: SF.net SVN: gar:[22270] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 22270 http://gar.svn.sourceforge.net/gar/?rev=22270&view=rev Author: guengel Date: 2013-10-21 09:08:39 +0000 (Mon, 21 Oct 2013) Log Message: ----------- postgresql/branches/postgresql-8.4: Bumped to new upstream version 8.4.18. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-10-21 08:39:15 UTC (rev 22269) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2013-10-21 09:08:39 UTC (rev 22270) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 17 +PATCHLEVEL = 18 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2013-10-21 08:39:15 UTC (rev 22269) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2013-10-21 09:08:39 UTC (rev 22270) @@ -1,3 +1,10 @@ +postgresql84 (8.4.18,REV=2013.10.21) + + * New upstream release 8.4.18. + + -- Rafael Ostertag Mon, 21 Oct 2013 09:06:51 +0200 + + postgresql84 (8.4.17,REV=2013.04.06) * New upstream release 8.4.17. 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 Oct 21 11:10:41 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 21 Oct 2013 09:10:41 +0000 Subject: SF.net SVN: gar:[22271] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ checksums Message-ID: Revision: 22271 http://gar.svn.sourceforge.net/gar/?rev=22271&view=rev Author: guengel Date: 2013-10-21 09:10:41 +0000 (Mon, 21 Oct 2013) Log Message: ----------- postgresql/branches/postgresql-8.4: Updated checksum file. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-10-21 09:08:39 UTC (rev 22270) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2013-10-21 09:10:41 UTC (rev 22271) @@ -1 +1 @@ -5cffae539198764301c0b2a36ae63fe1 postgresql-8.4.17.tar.bz2 +b5786d737b13f9fa687bf82e923b766d postgresql-8.4.18.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Oct 21 12:03:09 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 21 Oct 2013 10:03:09 +0000 Subject: SF.net SVN: gar:[22272] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22272 http://gar.svn.sourceforge.net/gar/?rev=22272&view=rev Author: pfelecan Date: 2013-10-21 10:03:08 +0000 (Mon, 21 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: split in sub-packages and add documentation Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 09:10:41 UTC (rev 22271) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 10:03:08 UTC (rev 22272) @@ -23,6 +23,7 @@ frontends exist but are not included. endef +VENDOR_URL = http://www.mplayerhq.hu/MPlayer/ MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/ MASTER_SITES += http://ffmpeg.org/releases/ DISTFILES = $(NAME)-export-snapshot.tar.bz2 @@ -30,10 +31,13 @@ DISTNAME = $(NAME)-export-$(YEAR)-$(MONTH)-$(DAY) PATCHFILES += 0001-configure-uses-bash.patch PATCHFILES += 0002-version-uses-bash.patch +PATCHFILES += 0003-use-csw-catalog-for-documentation.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 +BUILD_DEP_PKGS += CSWdocbookdtds +BUILD_DEP_PKGS += CSWdocbookxsl BUILD_DEP_PKGS += CSWfaac BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWliba52 @@ -78,59 +82,41 @@ BUILD_SCRIPTS = custom TEST_SCRIPTS = custom -RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac -RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 -RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 -RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 -RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa -RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 -RUNTIME_DEP_PKGS_CSWmplayer += CSWnas +PACKAGES = CSWmplayer +CATALOGNAME_CSWmplayer = mplayer +SPKG_DESC_CSWmplayer = $(DESCRIPTION), the player +RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac +RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa +RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmplayer += CSWnas -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.62 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng12.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbis.so.0 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4 -CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1 +# only on BO build farm; on my build farm it's included and detected TODO +CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0 + CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4 @@ -163,6 +149,68 @@ CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 +PACKAGES += CSWmencoder +CATALOGNAME_CSWmencoder = mencoder +SPKG_DESC_CSWmencoder = $(DESCRIPTION), the encoder +PKGFILES_CSWmencoder += /opt/csw/bin/mencoder +PKGFILES_CSWmencoder += /opt/csw/share/man/man1/mencoder.1 + +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibxvidcore4 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfaad2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWmencoder += CSWfaac +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWliblzo2-2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123 +RUNTIME_DEP_PKGS_CSWmencoder += CSWmplayer +CHECKPKG_OVERRIDES_CSWmencoder += surplus-dependency|CSWmplayer + +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.62 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng12.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbis.so.0 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4 +CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1 + +PACKAGES += CSWmplayer-doc +CATALOGNAME_CSWmplayer-doc = $(NAME)_doc +SPKG_DESC_CSWmplayer-doc = $(DESCRIPTION), the documentation +PKGFILES_CSWmplayer-doc += $(docdir)/$(NAME)_doc/.* +ARCHALL_CSWmplayer-doc = 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) @@ -195,7 +243,8 @@ build-custom: cd $(WORKSRC) && \ - $(MAKE) + $(MAKE) && \ + $(MAKE) doc $(MAKECOOKIE) test-custom: @@ -205,3 +254,14 @@ $(MAKE) FATE_SAMPLES=$(testData) fatetest endif $(MAKECOOKIE) + +post-install: thedocdir = $(docdir)/$(NAME)_doc +post-install: thehtmldocdir = $(thedocdir)/html +post-install: + ginstall -d "$(DESTDIR)/$(thedocdir)" + gtar --directory $(WORKSRC)/DOCS --create --file=- tech | \ + gtar --directory $(DESTDIR)/$(thedocdir) --extract + ginstall -d "$(DESTDIR)/$(thehtmldocdir)" + gtar --directory $(WORKSRC)/DOCS/HTML/en --create --file=- . | \ + gtar --directory $(DESTDIR)/$(thehtmldocdir) --extract + $(MAKECOOKIE) Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch 2013-10-21 10:03:08 UTC (rev 22272) @@ -0,0 +1,36 @@ +From 51254d28ae3fa12862f9007ac169897e9fc740fd Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 21 Oct 2013 11:20:17 +0200 +Subject: [PATCH] use csw catalog for documentation + +--- + configure | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/configure b/configure +index f284646..53bfb0d 100755 +--- a/configure ++++ b/configure +@@ -8057,18 +8057,7 @@ extra_ldflags="$extra_ldflags -lm" + # XML documentation tests + echocheck "XML catalogs" + for try_catalog in \ +- /etc/sgml/catalog \ +- /usr/share/xml/docbook/*/catalog.xml \ +- /opt/local/share/xml/docbook-xml/*/catalog.xml \ +- /opt/local/share/xml/docbook/*/catalog.xml \ +- /usr/share/sgml/docbook/*/*catalog \ +- /usr/share/apps/ksgmltools2/customization/en/catalog \ +- /usr/share/sgml/catalog \ +- /usr/local/share/sgml/catalog \ +- /usr/lib/sgml/catalog \ +- /usr/local/lib/sgml/catalog \ +- /usr/share/docbook-xml42/catalog.xml \ +- /usr/share/sgml/docbook/xmlcatalog; do ++ /opt/csw/share/sgml/docbook/xml-dtd-4.1.2/catalog; do + if test -f "$try_catalog"; then + catalog=$try_catalog + break +-- +1.8.3.4 + 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 Oct 21 12:36:20 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 21 Oct 2013 10:36:20 +0000 Subject: SF.net SVN: gar:[22273] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 22273 http://gar.svn.sourceforge.net/gar/?rev=22273&view=rev Author: guengel Date: 2013-10-21 10:36:19 +0000 (Mon, 21 Oct 2013) Log Message: ----------- postgresql/branches/postgresql-9.0: Upstream release update to 9.0.14. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-10-21 10:03:08 UTC (rev 22272) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2013-10-21 10:36:19 UTC (rev 22273) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 13 +PATCHLEVEL = 14 VERSION = $(BASE_VERSION).$(PATCHLEVEL) PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-10-21 10:03:08 UTC (rev 22272) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2013-10-21 10:36:19 UTC (rev 22273) @@ -1 +1 @@ -1cb7a32fafdb192cb53d6f44810e6fa6 postgresql-9.0.13.tar.bz2 +efd374d5ce697aba781d1bf31b5f9b85 postgresql-9.0.14.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2013-10-21 10:03:08 UTC (rev 22272) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2013-10-21 10:36:19 UTC (rev 22273) @@ -1,3 +1,10 @@ +postgresql90 (9.0.14,REV=2013.10.21) + + * New upstream release 9.0.14. + + -- Rafael Ostertag Mon, 21 Oct 2013 12:33:27 +0200 + + postgresql90 (9.0.13,REV=2013.04.06) * New upstream release 9.0.13. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Oct 21 14:28:48 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 21 Oct 2013 12:28:48 +0000 Subject: SF.net SVN: gar:[22274] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22274 http://gar.svn.sourceforge.net/gar/?rev=22274&view=rev Author: pfelecan Date: 2013-10-21 12:28:47 +0000 (Mon, 21 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: additional override Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 10:36:19 UTC (rev 22273) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 12:28:47 UTC (rev 22274) @@ -148,6 +148,7 @@ CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libx264.so.133 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1 PACKAGES += CSWmencoder CATALOGNAME_CSWmencoder = mencoder 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 Oct 21 16:21:48 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 21 Oct 2013 14:21:48 +0000 Subject: SF.net SVN: gar:[22275] csw/mgar/pkg/postgresql/branches/postgresql-9.1 Message-ID: Revision: 22275 http://gar.svn.sourceforge.net/gar/?rev=22275&view=rev Author: guengel Date: 2013-10-21 14:21:46 +0000 (Mon, 21 Oct 2013) Log Message: ----------- postgresql/branches/postgresql-9.1: Upstream release update to 9.1.10. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-10-21 12:28:47 UTC (rev 22274) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2013-10-21 14:21:46 UTC (rev 22275) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 9 +PATCHLEVEL = 10 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-10-21 12:28:47 UTC (rev 22274) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2013-10-21 14:21:46 UTC (rev 22275) @@ -1 +1 @@ -6b5ea53dde48fcd79acfc8c196b83535 postgresql-9.1.9.tar.bz2 +1af18f12bca0796a05dca280cb3e9410 postgresql-9.1.10.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2013-10-21 12:28:47 UTC (rev 22274) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2013-10-21 14:21:46 UTC (rev 22275) @@ -1,3 +1,10 @@ +postgresql91 (9.1.10,REV=2013.10.21) + + * New upstream release 9.1.10. + + -- Rafael Ostertag Mon, 21 Oct 2013 16:19:40 +0200 + + postgresql91 (9.1.9,REV=2013.04.06) * New upstream release 9.1.9. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Oct 21 16:50:02 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 21 Oct 2013 14:50:02 +0000 Subject: SF.net SVN: gar:[22276] csw/mgar/pkg/mplayer/branches/snapshot/checksums Message-ID: Revision: 22276 http://gar.svn.sourceforge.net/gar/?rev=22276&view=rev Author: pfelecan Date: 2013-10-21 14:50:00 +0000 (Mon, 21 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: today Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-21 14:21:46 UTC (rev 22275) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-21 14:50:00 UTC (rev 22276) @@ -1,2 +1,2 @@ 8dbeee35114533293f840474fc9072e3 ffmpeg-snapshot.tar.bz2 -14c9ada9e8a6e70410bcfc9c0f5ef157 mplayer-export-snapshot.tar.bz2 +30482a54f3044eaef6ab2a3402d905fd mplayer-export-snapshot.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 Oct 21 18:39:13 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 21 Oct 2013 16:39:13 +0000 Subject: SF.net SVN: gar:[22277] csw/mgar/pkg Message-ID: Revision: 22277 http://gar.svn.sourceforge.net/gar/?rev=22277&view=rev Author: dmichelsen Date: 2013-10-21 16:39:12 +0000 (Mon, 21 Oct 2013) Log Message: ----------- mod_asn/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/mod_asn/ csw/mgar/pkg/mod_asn/Makefile csw/mgar/pkg/mod_asn/branches/ csw/mgar/pkg/mod_asn/tags/ csw/mgar/pkg/mod_asn/trunk/ csw/mgar/pkg/mod_asn/trunk/Makefile csw/mgar/pkg/mod_asn/trunk/checksums csw/mgar/pkg/mod_asn/trunk/files/ csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.preremove csw/mgar/pkg/mod_asn/trunk/files/asn_import.conf Added: csw/mgar/pkg/mod_asn/Makefile =================================================================== --- csw/mgar/pkg/mod_asn/Makefile (rev 0) +++ csw/mgar/pkg/mod_asn/Makefile 2013-10-21 16:39:12 UTC (rev 22277) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mod_asn/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/mod_asn/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_asn/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mod_asn/trunk/Makefile 2013-10-21 16:39:12 UTC (rev 22277) @@ -0,0 +1,67 @@ +NAME = mod_asn +VERSION = 1.5 +GARTYPE = v2 + +DESCRIPTION = An Apache module to look up routing data + +MASTER_SITES += http://mirrorbrain.org/files/releases/ +DISTFILES += $(NAME)-$(VERSION).tar.gz +DISTFILES += CSWap2-mod-asn.postinstall +DISTFILES += CSWap2-mod-asn.preremove +DISTFILES += asn_import.conf + +VENDOR_URL = http://mirrorbrain.org/mod_asn/ + +LICENSE = debian/copyright + +PACKAGES = CSWap2-mod-asn +RUNTIME_DEP_PKGS_CSWap2-mod-asn += CSWapache2 + +REINPLACEMENTS += cswpython +REINPLACE_MATCH_cswpython = \#!/usr/bin/env\ python +REINPLACE_WITH_cswpython = \#!/opt/csw/bin/python +REINPLACE_FILES_cswpython += asn_get_routeviews.py +REINPLACE_FILES_cswpython += asn_import.py + +REINPLACEMENTS += importconf +REINPLACE_MATCH_importconf = /etc/etc/asn_import.conf +REINPLACE_WITH_importconf = $(sysconfdir)/asn_import.conf +REINPLACE_FILES_importconf += asn_import.py + +# Apache paths +AP2_ROOT = $(prefix)/apache2 +AP2_LIBEXEC = $(AP2_ROOT)/libexec +AP2_APXS = $(AP2_ROOT)/sbin/apxs +AP2_MODS = 1 +AP2_MODFILES += mod_geoip2.so + +# No test suite available +TEST_SCRIPTS = +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +INSTALL_SCRIPTS = custom + +PRESERVECONF += $(prefix)/apache2/etc/extra/mod_asn.conf +PRESERVECONF += $(sysconfdir)/asn_import.conf + +include gar/category.mk + +build-custom: + $(BUILD_ENV) $(AP2_APXS) -c $(WORKSRC)/mod_asn.c + $(MAKECOOKIE) + +install-custom: DOCDEST=$(DESTDIR)$(docdir)/ap2_mod_asn +install-custom: + ginstall -d -m 755 $(DESTDIR)$(AP2_LIBEXEC) + cd $(WORKSRC) && $(AP2_APXS) -S LIBEXECDIR=$(DESTDIR)$(AP2_LIBEXEC) -i mod_asn.la + ginstall -d -m 755 $(DESTDIR)$(prefix)/apache2/etc/extra + ginstall -m 0644 $(WORKSRC)/mod_asn.conf $(DESTDIR)$(prefix)/apache2/etc/extra/mod_asn.conf + ginstall -d -m 755 $(DESTDIR)$(bindir) + ginstall -m 0755 $(WORKSRC)/asn_get_routeviews.py $(DESTDIR)$(bindir)/asn_get_routeviews + ginstall -m 0755 $(WORKSRC)/asn_import.py $(DESTDIR)$(bindir)/asn_import + ginstall -d -m 755 $(DESTDIR)$(sysconfdir) + ginstall -m 0644 $(WORKDIR)/asn_import.conf $(DESTDIR)$(sysconfdir) + ginstall -d -m 755 $(DOCDEST) + ginstall -m 644 $(WORKSRC)/asn.sql $(DOCDEST)/asn.sql + $(MAKECOOKIE) + Property changes on: csw/mgar/pkg/mod_asn/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mod_asn/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_asn/trunk/checksums (rev 0) +++ csw/mgar/pkg/mod_asn/trunk/checksums 2013-10-21 16:39:12 UTC (rev 22277) @@ -0,0 +1 @@ +a9fd63e5026155b898da3df7648de344 mod_asn-1.5.tar.gz Copied: csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall (from rev 22069, csw/mgar/pkg/mod_auth_radius/trunk/files/CSWap2modauthradius.postinstall) =================================================================== --- csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall (rev 0) +++ csw/mgar/pkg/mod_asn/trunk/files/CSWap2-mod-asn.postinstall 2013-10-21 16:39:12 UTC (rev 22277) @@ -0,0 +1,25 @@ +#!/bin/sh + +CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw +AP2_PREFIX=$CSW_PREFIX/apache2 +AP2_BINDIR=$AP2_PREFIX/sbin +AP2_LIBEXEC=$AP2_PREFIX/libexec +AP2_CONFDIR=$AP2_PREFIX/etc +AP2_EXTRADIR=$AP2_CONFDIR/extra +AP2_CONFIG=$AP2_CONFDIR/httpd.conf + +# Enable the auth_radius modules +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} +chroot $PKG_INSTALL_ROOT \ + $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n \ + asn mod_asn.so + +# Finito +cat < Revision: 22278 http://gar.svn.sourceforge.net/gar/?rev=22278&view=rev Author: guengel Date: 2013-10-21 18:33:57 +0000 (Mon, 21 Oct 2013) Log Message: ----------- postgresql/branches/postgresql-9.2: Bumped version to 9.2.5. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2013-10-21 16:39:12 UTC (rev 22277) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/Makefile 2013-10-21 18:33:57 UTC (rev 22278) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 4 +PATCHLEVEL = 5 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2013-10-21 16:39:12 UTC (rev 22277) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/checksums 2013-10-21 18:33:57 UTC (rev 22278) @@ -1 +1 @@ -6ee5bb53b97da7c6ad9cb0825d3300dd postgresql-9.2.4.tar.bz2 +e8438e0ed5e6371741be7697886e7340 postgresql-9.2.5.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2013-10-21 16:39:12 UTC (rev 22277) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.2/files/changelog.CSW 2013-10-21 18:33:57 UTC (rev 22278) @@ -1,3 +1,10 @@ +postgresql92 (9.2.5,REV=2013.10.21) + + * New upstream release 9.2.5. + + -- Rafael Ostertag Mon, 21 Oct 2013 20:31:07 +0200 + + postgresql92 (9.2.4,REV=2013.04.06) * New upstream release 9.2.4. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 22 11:06:41 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 22 Oct 2013 09:06:41 +0000 Subject: SF.net SVN: gar:[22279] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22279 http://gar.svn.sourceforge.net/gar/?rev=22279&view=rev Author: pfelecan Date: 2013-10-22 09:06:41 +0000 (Tue, 22 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: - upgrade to last snapshot - SSE detection patch Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/files/0004-test-sse-support.patch Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 18:33:57 UTC (rev 22278) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-22 09:06:41 UTC (rev 22279) @@ -32,6 +32,7 @@ PATCHFILES += 0001-configure-uses-bash.patch PATCHFILES += 0002-version-uses-bash.patch PATCHFILES += 0003-use-csw-catalog-for-documentation.patch +PATCHFILES += 0004-test-sse-support.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-21 18:33:57 UTC (rev 22278) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-22 09:06:41 UTC (rev 22279) @@ -1,2 +1,2 @@ -8dbeee35114533293f840474fc9072e3 ffmpeg-snapshot.tar.bz2 -30482a54f3044eaef6ab2a3402d905fd mplayer-export-snapshot.tar.bz2 +0e7a2ba888956df3396b7795138d6522 ffmpeg-snapshot.tar.bz2 +89cacb1cd8734f2d9fd3f60fa08d50da mplayer-export-snapshot.tar.bz2 Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0004-test-sse-support.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0004-test-sse-support.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0004-test-sse-support.patch 2013-10-22 09:06:41 UTC (rev 22279) @@ -0,0 +1,91 @@ +From 808e6ddb5b81148c8c521cbbc813ed88b29db0ec Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 22 Oct 2013 10:14:41 +0200 +Subject: [PATCH] test sse support + +--- + cpudetect.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 60 insertions(+), 1 deletion(-) + +diff --git a/cpudetect.c b/cpudetect.c +index 99dff23..3a499e0 100644 +--- a/cpudetect.c ++++ b/cpudetect.c +@@ -46,6 +46,10 @@ CpuCaps gCpuCaps; + #include + #elif defined(__AMIGAOS4__) + #include ++#elif defined(sun) ++#include ++#include ++#include + #endif + + /* Thanks to the FreeBSD project for some of this cpuid code, and +@@ -208,7 +212,62 @@ static void check_os_katmai_support( void ) + * safe to go ahead and hook out the SSE code throughout Mesa. + */ + mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" ); +-#else ++#elif defined(sun) ++ /* determine if SSE is available for the current CPU running ++ * Solaris in 32 bit mode; this can be done only for 5.10 or ++ * greater. ++ */ ++ struct utsname un; ++ char* dot; ++ int minor; ++ int major; ++ uint_t ui; ++ gCpuCaps.hasSSE=0; ++ if(uname(&un) != -1) ++ { ++ if(strcmp(un.sysname, "SunOS") == 0) ++ { ++ dot = strchr(un.release, '.'); ++ errno = 0; ++ if(dot != (char*)0) ++ { ++ minor = atoi(dot + 1); ++ *dot = '\0'; ++ if(!errno) ++ { ++ major = atoi(un.release); ++ if(!errno) ++ { ++ if(major >= 5 && minor >= 10) ++ { ++ (void)getisax(&ui, 1); ++ if(ui & AV_386_SSE) ++ { ++ gCpuCaps.hasSSE=1; ++ } ++ if(ui & AV_386_SSE2) ++ { ++ gCpuCaps.hasSSE2=1; ++ } ++ if(ui & AV_386_SSE3) ++ { ++ gCpuCaps.hasSSE3=1; ++ } ++ if(ui & AV_386_SSSE3) ++ { ++ gCpuCaps.hasSSSE3=1; ++ } ++ if(ui & AV_386_AMD_SSE4A) ++ { ++ gCpuCaps.hasSSE4a=1; ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++#else /* : defined(sun) */ + /* Do nothing on other platforms for now. + */ + mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, leaving disabled.\n" ); +-- +1.8.3.4 + 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 Oct 22 12:05:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 10:05:26 +0000 Subject: SF.net SVN: gar:[22280] csw/mgar/pkg Message-ID: Revision: 22280 http://gar.svn.sourceforge.net/gar/?rev=22280&view=rev Author: dmichelsen Date: 2013-10-22 10:05:25 +0000 (Tue, 22 Oct 2013) Log Message: ----------- route-views-data/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/route-views-data/ csw/mgar/pkg/route-views-data/Makefile csw/mgar/pkg/route-views-data/branches/ csw/mgar/pkg/route-views-data/tags/ csw/mgar/pkg/route-views-data/trunk/ csw/mgar/pkg/route-views-data/trunk/Makefile csw/mgar/pkg/route-views-data/trunk/checksums csw/mgar/pkg/route-views-data/trunk/files/ Added: csw/mgar/pkg/route-views-data/Makefile =================================================================== --- csw/mgar/pkg/route-views-data/Makefile (rev 0) +++ csw/mgar/pkg/route-views-data/Makefile 2013-10-22 10:05:25 UTC (rev 22280) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/route-views-data/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/route-views-data/trunk/Makefile =================================================================== --- csw/mgar/pkg/route-views-data/trunk/Makefile (rev 0) +++ csw/mgar/pkg/route-views-data/trunk/Makefile 2013-10-22 10:05:25 UTC (rev 22280) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = oix-full-snapshot +VERSION = 2013.10.22.0000 +GARTYPE = v2 + +DESCRIPTION = OIX route views data + +MASTER_SITES = http://archive.routeviews.org/oix-route-views/$(shell echo $(VERSION) | cut -d. -f1).$(shell echo $(VERSION) | cut -d. -f2)/ +ROUTEVIEW_FILE = $(NAME)-$(subst .,-,$(VERSION)).bz2 +DISTFILES += $(ROUTEVIEW_FILE) + +PACKAGES += CSWroute-views-data +SPKG_DESC_CSWroute-views-data = OIX route views data +# PKGFILES is catchall +ARCHALL_CSWroute-views-data = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d -m 0755 $(DESTDIR)$(datadir)/routeviews + ginstall -m 0644 $(WORKDIR)/$(ROUTEVIEW_FILE) $(DESTDIR)$(datadir)/routeviews + ln -s $(ROUTEVIEW_FILE) $(DESTDIR)$(datadir)/routeviews/oix-full-snapshot-latest.dat.bz2 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/route-views-data/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/route-views-data/trunk/checksums =================================================================== --- csw/mgar/pkg/route-views-data/trunk/checksums (rev 0) +++ csw/mgar/pkg/route-views-data/trunk/checksums 2013-10-22 10:05:25 UTC (rev 22280) @@ -0,0 +1 @@ +564f2d5516ee118bf443c1474d89f859 oix-full-snapshot-2013-10-22-0000.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue Oct 22 13:13:55 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 22 Oct 2013 11:13:55 +0000 Subject: SF.net SVN: gar:[22281] csw/mgar/pkg/puppet3/trunk Message-ID: Revision: 22281 http://gar.svn.sourceforge.net/gar/?rev=22281&view=rev Author: phipsy Date: 2013-10-22 11:13:53 +0000 (Tue, 22 Oct 2013) Log Message: ----------- puppet3: version ramp - 3.3.1 Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile csw/mgar/pkg/puppet3/trunk/checksums Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-10-22 10:05:25 UTC (rev 22280) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-10-22 11:13:53 UTC (rev 22281) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.2.4 +VERSION = 3.3.1 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-10-22 10:05:25 UTC (rev 22280) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-10-22 11:13:53 UTC (rev 22281) @@ -4,3 +4,4 @@ a9bce4fe7a68aebcb6e97256e7faac5b puppet-3.2.1.tar.gz 318de47ab9e7d41cce98c1cbc5d33cc1 puppet-3.2.2.tar.gz 7084f61bea287ba6720ed2ccccd1fb03 puppet-3.2.4.tar.gz +e553c381df75b24c8eda00ecc6dcef8a puppet-3.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 Tue Oct 22 13:59:31 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 11:59:31 +0000 Subject: SF.net SVN: opencsw:[667] buildfarm/bin/find-obsolete-pkgs Message-ID: <3d3tYv2pgzz1WS@mail.opencsw.org> Revision: 667 http://sourceforge.net/p/opencsw/code/667 Author: dmichelsen Date: 2013-10-22 11:59:31 +0000 (Tue, 22 Oct 2013) Log Message: ----------- find-obsolete-pkgs: Initial commit Added Paths: ----------- buildfarm/bin/find-obsolete-pkgs Added: buildfarm/bin/find-obsolete-pkgs =================================================================== --- buildfarm/bin/find-obsolete-pkgs (rev 0) +++ buildfarm/bin/find-obsolete-pkgs 2013-10-22 11:59:31 UTC (rev 667) @@ -0,0 +1,25 @@ +#!/bin/sh + +PYTHONPATH=/home/web/bin/gar +export PYTHONPATH + +# /opt/csw/bin/python -c 'import json, sys; a = json.loads(sys.stdin.read()); print "\n".join(" ".join(x) for x in a)' | \ +# while read R A C; do \ + +for A in sparc i386; do + for R in SunOS5.9 SunOS5.10 SunOS5.11; do + echo "unstable -> kiel $A $R" + /home/web/bin/gar/lib/python/find_obsolete_pkgs.py \ + --from-catalog-release=unstable \ + --to-catalog-release=kiel \ + --os-arch=$A --os-release=$R \ + >/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs/unstable2kiel-$A-$R 2>&1 + echo "kiel -> dublin $A $R" + /home/web/bin/gar/lib/python/find_obsolete_pkgs.py \ + --from-catalog-release=kiel \ + --to-catalog-release=dublin \ + --os-arch=$A --os-release=$R \ + >/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs/kiel2dublin-$A-$R 2>&1 + done +done + Property changes on: buildfarm/bin/find-obsolete-pkgs ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Oct 22 15:11:17 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 22 Oct 2013 13:11:17 +0000 Subject: SF.net SVN: gar:[22282] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22282 http://gar.svn.sourceforge.net/gar/?rev=22282&view=rev Author: pfelecan Date: 2013-10-22 13:11:17 +0000 (Tue, 22 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: X11 support Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-22 11:13:53 UTC (rev 22281) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-22 13:11:17 UTC (rev 22282) @@ -33,6 +33,7 @@ PATCHFILES += 0002-version-uses-bash.patch PATCHFILES += 0003-use-csw-catalog-for-documentation.patch PATCHFILES += 0004-test-sse-support.patch +PATCHFILES += 0005-enhance-X-Windows-detection.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -150,6 +151,12 @@ CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libX11.so.4 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXext.so.0 +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1 +# these is available only for i386 and BTW is not part of our libraires +CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1 +CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics PACKAGES += CSWmencoder CATALOGNAME_CSWmencoder = mencoder @@ -222,8 +229,13 @@ mv ../ffmpeg ffmpeg $(MAKECOOKIE) -# configure is not configure ! -# must use internal dvdnav as our library is not a snapshot +# - configure is not configure ! +# - must use internal dvdnav as our library is not a snapshot and +# mplayer uses new primitives +# - run-time CPU detection is not implemented only for SPARC +# - disable shared memory, used only for X11, which, in Solaris 10 +# extensions doesn't support all the required primitives, +# e.g. XShmGetEventBase ifneq ($(GARCH),sparc) CPU_DETECTION =--enable-runtime-cpudetection @@ -239,6 +251,7 @@ --extra-cflags='-std=gnu99' \ --extra-ldflags='-lrt' \ $(CPU_DETECTION) \ + --disable-shm \ --prefix=$(prefix) \ --codecsdir=$(libexecdir)/mplayer $(MAKECOOKIE) Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch 2013-10-22 13:11:17 UTC (rev 22282) @@ -0,0 +1,56 @@ +From f65b3b496e17ae71669e9dd3b3431ac709898e82 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 22 Oct 2013 14:12:27 +0200 +Subject: [PATCH] enhance X Windows detection + +--- + configure | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 53bfb0d..407837e 100755 +--- a/configure ++++ b/configure +@@ -4443,6 +4443,12 @@ echocheck "X11 headers presence" + fi + echores "$_x11_headers" + ++ifBroken='' ++needsXlib='' ++if sunos; then ++ ifBroken="_broken" ++ needsXlib="X11/Xlib.h" ++fi + + echocheck "X11" + if test "$_x11" = auto && test "$_x11_headers" = yes ; then +@@ -4454,7 +4460,7 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then + else + ld_tmp="$I -lXext -lX11 $ld_pthread" + fi +- statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp && ++ statement_check${ifBroken} ${needsXlib} X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp && + libs_mplayer="$libs_mplayer $ld_tmp" && _x11=yes && break + done + fi +@@ -4472,7 +4478,7 @@ echores "$_x11" + echocheck "Xss screensaver extensions" + if test "$_xss" = auto ; then + _xss=no +- statement_check "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes ++ statement_check${ifBroken} ${neddsXlib} "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes + fi + if test "$_xss" = yes ; then + def_xss='#define CONFIG_XSS 1' +@@ -4598,7 +4604,7 @@ echores "$_vdpau" + echocheck "Xinerama" + if test "$_xinerama" = auto && test "$_x11" = yes ; then + _xinerama=no +- statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes ++ statement_check${ifBroken} ${needsXlib} X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes + fi + + if test "$_xinerama" = yes ; then +-- +1.8.3.4 + 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 Oct 22 15:14:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 13:14:10 +0000 Subject: SF.net SVN: gar:[22283] csw/mgar/pkg/geolitedb/trunk Message-ID: Revision: 22283 http://gar.svn.sourceforge.net/gar/?rev=22283&view=rev Author: dmichelsen Date: 2013-10-22 13:14:09 +0000 (Tue, 22 Oct 2013) Log Message: ----------- geolitedb/trunk: Update to 20131022 Modified Paths: -------------- csw/mgar/pkg/geolitedb/trunk/Makefile csw/mgar/pkg/geolitedb/trunk/checksums Modified: csw/mgar/pkg/geolitedb/trunk/Makefile =================================================================== --- csw/mgar/pkg/geolitedb/trunk/Makefile 2013-10-22 13:11:17 UTC (rev 22282) +++ csw/mgar/pkg/geolitedb/trunk/Makefile 2013-10-22 13:14:09 UTC (rev 22283) @@ -1,19 +1,22 @@ NAME = geolitedb -VERSION = 20130822 +VERSION = 20131022 GARTYPE = v2 DESCRIPTION = Geolite country database -MASTER_SITES += http://download.maxmind.com/download/geoip/database/ -MASTER_SITES += http://download.maxmind.com/download/geoip/database/GeoLiteCountry/ -MASTER_SITES += http://download.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/ +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/ +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/ MASTER_SITES += http://download.maxmind.com/download/geoip/database/asnum/ +MASTER_SITES += http://geolite.maxmind.com/download/geoip/database/ + DISTFILES += GeoIP.dat.gz DISTFILES += GeoIPv6.dat.gz DISTFILES += GeoLiteCity.dat.xz DISTFILES += GeoLiteCityv6.dat.gz DISTFILES += GeoIPASNum.dat.gz DISTFILES += GeoIPASNumv6.dat.gz +DISTFILES += GeoLite2-City.mmdb.gz +DISTFILES += GeoLite2-Country.mmdb.gz DISTFILES += COPYING VENDOR_URL = http://dev.maxmind.com/geoip/legacy/geolite/ @@ -36,4 +39,6 @@ ginstall $(WORKDIR)/GeoLiteCityv6.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPCityv6.dat ginstall $(WORKDIR)/GeoIPASNum.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPASNum.dat ginstall $(WORKDIR)/GeoIPASNumv6.dat $(DESTDIR)/opt/csw/share/GeoIP/GeoIPASNumv6.dat + ginstall $(WORKDIR)/GeoLite2-City.mmdb $(DESTDIR)/opt/csw/share/GeoIP/GeoLite2-City.mmdb + ginstall $(WORKDIR)/GeoLite2-Country.mmdb $(DESTDIR)/opt/csw/share/GeoIP/GeoLite2-Country.mmdb @$(MAKECOOKIE) Modified: csw/mgar/pkg/geolitedb/trunk/checksums =================================================================== --- csw/mgar/pkg/geolitedb/trunk/checksums 2013-10-22 13:11:17 UTC (rev 22282) +++ csw/mgar/pkg/geolitedb/trunk/checksums 2013-10-22 13:14:09 UTC (rev 22283) @@ -1,6 +1,8 @@ -f3eee10daa10fe5a4ca204daf8aff689 GeoIP.dat.gz -7787b1b75626cef57680c809cd9ca059 GeoIPASNum.dat.gz +4aecef560aa6dacfe7e59dad8a12914b GeoIP.dat.gz +92f33f809312b99ea72fca1bf2691302 GeoIPASNum.dat.gz 55af75660db5db2f94effcbdc1b7fed9 GeoIPASNumv6.dat.gz -e02d3809e312cf0a0628015c9a0190fa GeoIPv6.dat.gz +9e1336ddf9b2513559bed416f339387f GeoIPv6.dat.gz +5f1e1fa26efac1da40a3a8ba98ae84dd GeoLite2-City.mmdb.gz +e01941d8cfd50c43ecde3d5d6a54882d GeoLite2-Country.mmdb.gz a273ba6bef3e3e60cb3f1a71378fdb3e GeoLiteCity.dat.xz -c5dd0ae06fd3d9fa9d2b09fa6d963497 GeoLiteCityv6.dat.gz +18b732df0bc61823921d71a75b7fcfed GeoLiteCityv6.dat.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 Oct 22 15:20:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 13:20:02 +0000 Subject: SF.net SVN: opencsw:[668] buildfarm/bin/find-obsolete-pkgs Message-ID: <3d3wLk2Tg7zFg@mail.opencsw.org> Revision: 668 http://sourceforge.net/p/opencsw/code/668 Author: dmichelsen Date: 2013-10-22 13:19:59 +0000 (Tue, 22 Oct 2013) Log Message: ----------- find-obsolete-pkgs: Race conditions on browsing Modified Paths: -------------- buildfarm/bin/find-obsolete-pkgs Modified: buildfarm/bin/find-obsolete-pkgs =================================================================== --- buildfarm/bin/find-obsolete-pkgs 2013-10-22 11:59:31 UTC (rev 667) +++ buildfarm/bin/find-obsolete-pkgs 2013-10-22 13:19:59 UTC (rev 668) @@ -6,6 +6,8 @@ # /opt/csw/bin/python -c 'import json, sys; a = json.loads(sys.stdin.read()); print "\n".join(" ".join(x) for x in a)' | \ # while read R A C; do \ +HTMLDIR=/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs + for A in sparc i386; do for R in SunOS5.9 SunOS5.10 SunOS5.11; do echo "unstable -> kiel $A $R" @@ -13,13 +15,17 @@ --from-catalog-release=unstable \ --to-catalog-release=kiel \ --os-arch=$A --os-release=$R \ - >/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs/unstable2kiel-$A-$R 2>&1 + >$(HTMLDIR)/.unstable2kiel-${A}-${R}.new 2>&1 + mv $(HTMLDIR)/.unstable2kiel-${A}-${R}.new \ + $(HTMLDIR)/unstable2kiel-${A}-${R} echo "kiel -> dublin $A $R" /home/web/bin/gar/lib/python/find_obsolete_pkgs.py \ --from-catalog-release=kiel \ --to-catalog-release=dublin \ --os-arch=$A --os-release=$R \ - >/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs/kiel2dublin-$A-$R 2>&1 + >$(HTMLDIR)/.kiel2dublin-${A}-${R}.new 2>&1 + mv $(HTMLDIR)/.kiel2dublin-${A}-${R}.new \ + $(HTMLDIR)/kiel2dublin-${A}-${R} done done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 22 17:40:23 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 15:40:23 +0000 Subject: SF.net SVN: gar:[22284] csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Message-ID: Revision: 22284 http://gar.svn.sourceforge.net/gar/?rev=22284&view=rev Author: dmichelsen Date: 2013-10-22 15:40:22 +0000 (Tue, 22 Oct 2013) Log Message: ----------- find_obsolete_pkgs.py: Print list sorted Modified Paths: -------------- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py Modified: csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py =================================================================== --- csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2013-10-22 13:14:09 UTC (rev 22283) +++ csw/mgar/gar/v2/lib/python/find_obsolete_pkgs.py 2013-10-22 15:40:22 UTC (rev 22284) @@ -167,16 +167,18 @@ print ('write %s' % (fn_removelst % (newcatrel,osrel,arch))) rmcnt = 0 + remove_catnames = sorted(CatSubSet(*newcatlst[rp]).catalogname for rp in reallyremovelst) with open(fn_removelst % (newcatrel,osrel,arch), "w") as fd: - for rp in reallyremovelst: - fd.write(CatSubSet(*newcatlst[rp]).catalogname+'\n') + for c in remove_catnames: + fd.write(c+'\n') rmcnt = rmcnt + 1 logger.info("packages to remove: %d" % rmcnt) print ('write %s' % (fn_rebuildlst % (newcatrel,osrel,arch))) rbcnt = 0 + rebuild_catnames = sorted(CatSubSet(*newcatlst[rp]).catalogname for rp in rebuildlst) with open(fn_rebuildlst % (newcatrel,osrel,arch), "w") as fd: - for rp in rebuildlst: - fd.write(CatSubSet(*newcatlst[rp]).catalogname+'\n') + for c in rebuild_catnames: + fd.write(c+'\n') rbcnt = rbcnt + 1 logger.info("packages to rebuild: %d" % rbcnt) 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 Oct 22 18:10:48 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 16:10:48 +0000 Subject: SF.net SVN: gar:[22285] csw/mgar/pkg Message-ID: Revision: 22285 http://gar.svn.sourceforge.net/gar/?rev=22285&view=rev Author: dmichelsen Date: 2013-10-22 16:10:48 +0000 (Tue, 22 Oct 2013) Log Message: ----------- zsync/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/zsync/ csw/mgar/pkg/zsync/Makefile csw/mgar/pkg/zsync/branches/ csw/mgar/pkg/zsync/tags/ csw/mgar/pkg/zsync/trunk/ csw/mgar/pkg/zsync/trunk/Makefile csw/mgar/pkg/zsync/trunk/checksums csw/mgar/pkg/zsync/trunk/files/ Added: csw/mgar/pkg/zsync/Makefile =================================================================== --- csw/mgar/pkg/zsync/Makefile (rev 0) +++ csw/mgar/pkg/zsync/Makefile 2013-10-22 16:10:48 UTC (rev 22285) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/zsync/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/zsync/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsync/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zsync/trunk/Makefile 2013-10-22 16:10:48 UTC (rev 22285) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = zsync +VERSION = 0.6.2 +GARTYPE = v2 + +DESCRIPTION = A file transfer program + +MASTER_SITES = http://zsync.moria.org.uk/download/ +DISTFILES = $(DISTNAME).tar.bz2 + +VENDOR_URL = http://zsync.moria.org.uk + +EXTRA_CFLAGS += -xc99=all + +BUILD64 = 1 +ISAEXEC = 1 + +include gar/category.mk + Property changes on: csw/mgar/pkg/zsync/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/zsync/trunk/checksums =================================================================== --- csw/mgar/pkg/zsync/trunk/checksums (rev 0) +++ csw/mgar/pkg/zsync/trunk/checksums 2013-10-22 16:10:48 UTC (rev 22285) @@ -0,0 +1 @@ +862f90bafda118c4d3c5ee6477e50841 zsync-0.6.2.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 Tue Oct 22 19:19:13 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 22 Oct 2013 17:19:13 +0000 Subject: SF.net SVN: gar:[22286] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 22286 http://gar.svn.sourceforge.net/gar/?rev=22286&view=rev Author: guengel Date: 2013-10-22 17:19:13 +0000 (Tue, 22 Oct 2013) Log Message: ----------- postgresql/trunk: New upstream release 9.3.1 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-22 16:10:48 UTC (rev 22285) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-22 17:19:13 UTC (rev 22286) @@ -90,7 +90,7 @@ BASE_VERSION = 9.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 0 +PATCHLEVEL = 1 VERSION = $(BASE_VERSION).$(PATCHLEVEL) GARTYPE = v2 GARCOMPILER = SOS12U3 Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2013-10-22 16:10:48 UTC (rev 22285) +++ csw/mgar/pkg/postgresql/trunk/checksums 2013-10-22 17:19:13 UTC (rev 22286) @@ -1 +1 @@ -09aee56f3a15ce4a7ea32044fb845b53 postgresql-9.3.0.tar.bz2 +c003d871f712d4d3895956b028a96e74 postgresql-9.3.1.tar.bz2 Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-22 16:10:48 UTC (rev 22285) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2013-10-22 17:19:13 UTC (rev 22286) @@ -1,3 +1,10 @@ +postgresql93 (9.3.1,REV=2013.10.22) + + * New upstream release 9.3.1. + + -- Rafael Ostertag Tue, 22 Oct 2013 19:16:40 +0200 + + postgresql93 (9.3.0,REV=2013.10.06) * New upstream release 9.3.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 Tue Oct 22 20:46:08 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 22 Oct 2013 18:46:08 +0000 Subject: SF.net SVN: gar:[22287] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 22287 http://gar.svn.sourceforge.net/gar/?rev=22287&view=rev Author: guengel Date: 2013-10-22 18:46:07 +0000 (Tue, 22 Oct 2013) Log Message: ----------- postgresql/trunk: Adjusted to minor changes. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-22 17:19:13 UTC (rev 22286) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2013-10-22 18:46:07 UTC (rev 22287) @@ -178,7 +178,7 @@ 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--1.1.sql hstore--1.1.sql hstore.control hstore--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += hstore--1.0--1.1.sql hstore--1.1--1.2.sql hstore--1.2.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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Oct 22 22:57:24 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 22 Oct 2013 20:57:24 +0000 Subject: SF.net SVN: gar:[22288] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22288 http://gar.svn.sourceforge.net/gar/?rev=22288&view=rev Author: lblume Date: 2013-10-22 20:57:24 +0000 (Tue, 22 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Modifying install dirs makes mgar unhappy - adjust scripts instead 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 2013-10-22 18:46:07 UTC (rev 22287) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-22 20:57:24 UTC (rev 22288) @@ -80,12 +80,6 @@ MYSQL_LIB_VER = 18 -# Ensure that the install directories match the ISA name so -# the scripts will work as expected -bindir = $(abspath $(bindir_install)/$(ISABINDIR)) -sbindir = $(abspath $(sbindir_install)/$(ISABINDIR)) -libexecdir = $(abspath $(libexecdir_install)/$(ISABINDIR)) - # The daemon to launch is selected by script, should not be automatic # Some other files too should probably not be isaexec'd EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/libexec/mysqld @@ -371,6 +365,17 @@ 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) + + # Make sure the proper binary is called by the script since + # mgar does the configure part using only the base arch name, w/o + # the special instructions part + for file in mysqld_safe mysqld_multi; do \ + gsed -i \ + -e 's|bin/$(MM_BINDIR)|bin/$(ISABINDIR)/|g' \ + -e 's|sbin/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \ + -e 's|libexec/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \ + $(DESTDIR)$(bindir)/$$file; \ + done @$(MAKECOOKIE) post-merge: 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 Oct 22 23:38:24 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 22 Oct 2013 21:38:24 +0000 Subject: SF.net SVN: gar:[22289] csw/mgar/pkg/wavpack/trunk Message-ID: Revision: 22289 http://gar.svn.sourceforge.net/gar/?rev=22289&view=rev Author: dmichelsen Date: 2013-10-22 21:38:23 +0000 (Tue, 22 Oct 2013) Log Message: ----------- wavpack/trunk: Update to 4.70.0 Modified Paths: -------------- csw/mgar/pkg/wavpack/trunk/Makefile csw/mgar/pkg/wavpack/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wavpack/trunk/files/0001-Includes-are-needed-for-other-compilers-too.patch Modified: csw/mgar/pkg/wavpack/trunk/Makefile =================================================================== --- csw/mgar/pkg/wavpack/trunk/Makefile 2013-10-22 20:57:24 UTC (rev 22288) +++ csw/mgar/pkg/wavpack/trunk/Makefile 2013-10-22 21:38:23 UTC (rev 22289) @@ -1,5 +1,5 @@ NAME = wavpack -VERSION = 4.60.1 +VERSION = 4.70.0 GARTYPE = v2 DESCRIPTION = Open audio compression format @@ -12,19 +12,18 @@ endef MASTER_SITES = http://www.wavpack.com/ -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 -LICENSE = license.txt +PATCHFILES += 0001-Includes-are-needed-for-other-compilers-too.patch PACKAGES += CSWlibwavpack1 SPKG_DESC_CSWlibwavpack1 = Open audio compression format library, libwavpack.so.1 PKGFILES_CSWlibwavpack1 = $(call pkgfiles_lib,libwavpack.so.1) -RUNTIME_DEP_PKGS_CSWlibwavpack1 += CSWiconv PACKAGES += CSWwavpack SPKG_DESC_CSWwavpack = Wavpack audio compression format tools # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWwavpack += CSWiconv +RUNTIME_DEP_PKGS_CSWwavpack += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWwavpack += CSWlibwavpack1 PACKAGES += CSWlibwavpack-dev @@ -32,6 +31,7 @@ PKGFILES_CSWlibwavpack-dev = $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibwavpack-dev = CSWlibwavpack1 -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 include gar/category.mk Modified: csw/mgar/pkg/wavpack/trunk/checksums =================================================================== --- csw/mgar/pkg/wavpack/trunk/checksums 2013-10-22 20:57:24 UTC (rev 22288) +++ csw/mgar/pkg/wavpack/trunk/checksums 2013-10-22 21:38:23 UTC (rev 22289) @@ -1 +1 @@ -7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 +4c0186ef0dc8367ce5cd7cc0f398b714 wavpack-4.70.0.tar.bz2 Added: csw/mgar/pkg/wavpack/trunk/files/0001-Includes-are-needed-for-other-compilers-too.patch =================================================================== --- csw/mgar/pkg/wavpack/trunk/files/0001-Includes-are-needed-for-other-compilers-too.patch (rev 0) +++ csw/mgar/pkg/wavpack/trunk/files/0001-Includes-are-needed-for-other-compilers-too.patch 2013-10-22 21:38:23 UTC (rev 22289) @@ -0,0 +1,25 @@ +From 175ce749675ad7891f35a5b8a9f064e6d3383a73 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 22 Oct 2013 23:22:42 +0200 +Subject: [PATCH] Includes are needed for other compilers too + +--- + cli/wavpack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cli/wavpack.c b/cli/wavpack.c +index 95a9728..43860a0 100644 +--- a/cli/wavpack.c ++++ b/cli/wavpack.c +@@ -37,7 +37,7 @@ + #include "utils.h" + #include "md5.h" + +-#if defined (__GNUC__) && !defined(WIN32) ++#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32) + #include + #include + #include +-- +1.8.3.4 + 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 Oct 23 13:01:21 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Oct 2013 11:01:21 +0000 Subject: SF.net SVN: gar:[22290] csw/mgar/pkg/buildbot/trunk/Makefile Message-ID: Revision: 22290 http://gar.svn.sourceforge.net/gar/?rev=22290&view=rev Author: dmichelsen Date: 2013-10-23 11:01:19 +0000 (Wed, 23 Oct 2013) Log Message: ----------- buildbot/trunk: Add one more dependency for manhole_ssh Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-22 21:38:23 UTC (rev 22289) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-23 11:01:19 UTC (rev 22290) @@ -37,6 +37,7 @@ RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-jinja2 RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-tempita RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-decorator +RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-openssl CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy @@ -45,6 +46,7 @@ CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-tempita CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-decorator +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-openssl # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot += pkgname-does-not-start-with-CSWpy- 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 Oct 23 14:02:47 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 23 Oct 2013 12:02:47 +0000 Subject: SF.net SVN: gar:[22291] csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile Message-ID: Revision: 22291 http://gar.svn.sourceforge.net/gar/?rev=22291&view=rev Author: dmichelsen Date: 2013-10-23 12:02:46 +0000 (Wed, 23 Oct 2013) Log Message: ----------- lang-python/pyopenssl/trunk: Recipe cleanup Modified Paths: -------------- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-10-23 11:01:19 UTC (rev 22290) +++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile 2013-10-23 12:02:46 UTC (rev 22291) @@ -7,18 +7,16 @@ CATEGORIES = python DESCRIPTION = OpenSSL bindings for Python -define BLURB - OpenSSL bindings for Python -endef -MASTER_SITE_DIR = $(shell echo $(NAME) | cut -c 1) -MASTER_SITES = http://pypi.python.org/packages/source/$(MASTER_SITE_DIR)/$(NAME)/ -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES += $(DISTNAME).tar.gz BUILD_DEP_PKGS_CSWpy-openssl += CSWpython_dev BUILD_DEP_PKGS_CSWpy-openssl += CSWpython27_dev -PACKAGES = CSWpy-openssl +PACKAGES += CSWpy-openssl +SPKG_DESC_CSWpy-openssl = OpenSSL bindings for Python +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 23 17:12:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 23 Oct 2013 15:12:51 +0000 Subject: SF.net SVN: gar:[22292] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22292 http://gar.svn.sourceforge.net/gar/?rev=22292&view=rev Author: pfelecan Date: 2013-10-23 15:12:51 +0000 (Wed, 23 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: - memalign detection and support patches - new snapshot - new run-time dependency - ability to patch the ffmepg snapshot used Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Added Paths: ----------- csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-23 12:02:46 UTC (rev 22291) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-23 15:12:51 UTC (rev 22292) @@ -34,6 +34,8 @@ PATCHFILES += 0003-use-csw-catalog-for-documentation.patch PATCHFILES += 0004-test-sse-support.patch PATCHFILES += 0005-enhance-X-Windows-detection.patch +PATCHFILES += 0006-fix-memalign-detection.patch +PATCHFILES += 0007-fix-memalign-prototype.patch PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 @@ -119,6 +121,10 @@ # only on BO build farm; on my build farm it's included and detected TODO CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0 +# this cannot be computed: +RUNTIME_DEP_PKGS_CSWmplayer += CSWunrar +CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWunrar + CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0 CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4 @@ -226,7 +232,8 @@ post-extract: cd $(WORKSRC) && \ - mv ../ffmpeg ffmpeg + mv ../ffmpeg ffmpeg && \ + rm -f .gitignore $(MAKECOOKIE) # - configure is not configure ! Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-23 12:02:46 UTC (rev 22291) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-23 15:12:51 UTC (rev 22292) @@ -1,2 +1,2 @@ -0e7a2ba888956df3396b7795138d6522 ffmpeg-snapshot.tar.bz2 -89cacb1cd8734f2d9fd3f60fa08d50da mplayer-export-snapshot.tar.bz2 +1974183d76b42a1d343ee211396834c5 ffmpeg-snapshot.tar.bz2 +1ccfd06282fd705a307e0907ee9c8063 mplayer-export-snapshot.tar.bz2 Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch 2013-10-23 15:12:51 UTC (rev 22292) @@ -0,0 +1,24 @@ +From 291e34c28c9d9e7f488da650d0df9e907d14f991 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 23 Oct 2013 14:34:30 +0200 +Subject: [PATCH] fix memalign detection + +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index 407837e..89368a7 100755 +--- a/configure ++++ b/configure +@@ -3703,6 +3703,7 @@ echocheck "memalign()" + def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' + _memalign=no + statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes ++sunos && [ "${_memalign}" = "no" ] && statement_check stdlib.h 'memalign(64, sizeof(char))' && _memalign=yes + if test "$_memalign" = yes ; then + def_memalign='#define HAVE_MEMALIGN 1' + else +-- +1.8.3.4 + Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch (rev 0) +++ csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch 2013-10-23 15:12:51 UTC (rev 22292) @@ -0,0 +1,27 @@ +From 20d2bba739c17c9c3f7148fe2287e5ef3a50c5a7 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 23 Oct 2013 15:58:38 +0200 +Subject: [PATCH] fix memalign prototype + +--- + ffmpeg/libavutil/mem.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ffmpeg/libavutil/mem.c b/ffmpeg/libavutil/mem.c +index 5aad97a..488e433 100644 +--- a/ffmpeg/libavutil/mem.c ++++ b/ffmpeg/libavutil/mem.c +@@ -31,6 +31,10 @@ + #include + #include + #include ++#if defined(sun) ++/* when _XOPEN_SOURCE is defined, the prototype is excluded from stdlib!? */ ++extern void *memalign(size_t, size_t); ++#endif /* : defined(sun) */ + #include + #if HAVE_MALLOC_H + #include +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 23 17:55:14 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 23 Oct 2013 15:55:14 +0000 Subject: SF.net SVN: gar:[22293] csw/mgar/pkg/pidgin/trunk/Makefile Message-ID: Revision: 22293 http://gar.svn.sourceforge.net/gar/?rev=22293&view=rev Author: lblume Date: 2013-10-23 15:55:14 +0000 (Wed, 23 Oct 2013) Log Message: ----------- pidgin/trunk: Disable SASL: breaks IRC; add some build deps Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-23 15:12:51 UTC (rev 22292) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-23 15:55:14 UTC (rev 22293) @@ -13,6 +13,8 @@ DISTFILES += $(NAME)-$(VERSION).tar.bz2 STRIP_LIBTOOL = 1 +GARCOMPILER = SOS12U3 + VENDOR_URL = http://pidgin.im CONFIGURE_ARGS = $(DIRPATHS) @@ -31,7 +33,8 @@ CONFIGURE_ARGS += --enable-consoleui # We deffinitely want SASL -CONFIGURE_ARGS += --enable-cyrus-sasl +### BREAKS IRC +#CONFIGURE_ARGS += --enable-cyrus-sasl # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) @@ -106,6 +109,8 @@ BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWmeanwhile-dev BUILD_DEP_PKGS += CSWlibsilc-dev +BUILD_DEP_PKGS += CSWgstreamer-dev +BUILD_DEP_PKGS += CSWsasl-dev PATCHFILES += patch-pidgin-Makefile.in PATCHFILES += patch-pidgin-plugin.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Oct 23 20:06:03 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 23 Oct 2013 18:06:03 +0000 Subject: SF.net SVN: gar:[22294] csw/mgar/pkg/mplayer/branches/snapshot/Makefile Message-ID: Revision: 22294 http://gar.svn.sourceforge.net/gar/?rev=22294&view=rev Author: pfelecan Date: 2013-10-23 18:06:03 +0000 (Wed, 23 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: distribute a pre-processed manual page as the Solaris man cannot process it (better than to jumbo-patch it) Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-23 15:55:14 UTC (rev 22293) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-23 18:06:03 UTC (rev 22294) @@ -44,6 +44,7 @@ BUILD_DEP_PKGS += CSWdocbookxsl BUILD_DEP_PKGS += CSWfaac BUILD_DEP_PKGS += CSWfontconfig-dev +BUILD_DEP_PKGS += CSWgroff BUILD_DEP_PKGS += CSWliba52 BUILD_DEP_PKGS += CSWlibaa-dev BUILD_DEP_PKGS += CSWlibaudiofile-dev @@ -162,13 +163,17 @@ CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1 # these is available only for i386 and BTW is not part of our libraires CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1 +# this exists only on i386 and Solaris 10 CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics +# this in incongruous (dur to man/cat1 usage): +CHECKPKG_OVERRIDES_CSWmencoder += missing-dependency|CSWfltk PACKAGES += CSWmencoder CATALOGNAME_CSWmencoder = mencoder SPKG_DESC_CSWmencoder = $(DESCRIPTION), the encoder PKGFILES_CSWmencoder += /opt/csw/bin/mencoder PKGFILES_CSWmencoder += /opt/csw/share/man/man1/mencoder.1 +PKGFILES_CSWmencoder += /opt/csw/share/man/cat1/mencoder.1 RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52 @@ -279,7 +284,11 @@ post-install: thedocdir = $(docdir)/$(NAME)_doc post-install: thehtmldocdir = $(thedocdir)/html +post-install: thecatmandir = $(mandir)/cat1 post-install: + ginstall -d "$(DESTDIR)/$(thecatmandir)" + gnroff -Tlatin1 -mman $(WORKSRC)/DOCS/man/en/mplayer.1 > "$(DESTDIR)/$(thecatmandir)/mplayer.1" + cd "$(DESTDIR)/$(thecatmandir)" && ln -s mplayer.1 mencoder.1 ginstall -d "$(DESTDIR)/$(thedocdir)" gtar --directory $(WORKSRC)/DOCS --create --file=- tech | \ gtar --directory $(DESTDIR)/$(thedocdir) --extract This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Oct 23 23:08:05 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 23 Oct 2013 21:08:05 +0000 Subject: SF.net SVN: gar:[22295] csw/mgar/pkg/pidgin/trunk/Makefile Message-ID: Revision: 22295 http://gar.svn.sourceforge.net/gar/?rev=22295&view=rev Author: lblume Date: 2013-10-23 21:08:05 +0000 (Wed, 23 Oct 2013) Log Message: ----------- pidgin/trunk: Remove SASL deps for now Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-23 18:06:03 UTC (rev 22294) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-23 21:08:05 UTC (rev 22295) @@ -85,7 +85,7 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3 -RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 +#RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibxml2-dev @@ -110,7 +110,7 @@ BUILD_DEP_PKGS += CSWmeanwhile-dev BUILD_DEP_PKGS += CSWlibsilc-dev BUILD_DEP_PKGS += CSWgstreamer-dev -BUILD_DEP_PKGS += CSWsasl-dev +#BUILD_DEP_PKGS += CSWsasl-dev PATCHFILES += patch-pidgin-Makefile.in PATCHFILES += patch-pidgin-plugin.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Oct 24 10:41:23 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 24 Oct 2013 08:41:23 +0000 Subject: SF.net SVN: gar:[22296] csw/mgar/pkg/pidgin/trunk Message-ID: Revision: 22296 http://gar.svn.sourceforge.net/gar/?rev=22296&view=rev Author: lblume Date: 2013-10-24 08:41:22 +0000 (Thu, 24 Oct 2013) Log Message: ----------- pidgin/trunk: libirc.so was not linked against libsasl2.so Modified Paths: -------------- csw/mgar/pkg/pidgin/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch Modified: csw/mgar/pkg/pidgin/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-23 21:08:05 UTC (rev 22295) +++ csw/mgar/pkg/pidgin/trunk/Makefile 2013-10-24 08:41:22 UTC (rev 22296) @@ -33,19 +33,17 @@ CONFIGURE_ARGS += --enable-consoleui # We deffinitely want SASL -### BREAKS IRC -#CONFIGURE_ARGS += --enable-cyrus-sasl +CONFIGURE_ARGS += --enable-cyrus-sasl # For msgfmt, msgmerge, xgettext and gettext to be used from GNU CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) -CFLAGS = -xc99 -D_XPG6 -D__EXTENSIONS__ +EXTRA_CFLAGS = -xc99 -D_XPG6 -D__EXTENSIONS__ +EXTRA_LD_OPTIONS = -z nolazyload + NCURSES_HEADERS = /opt/csw/include/ncursesw EXTRA_CONFIGURE_EXPORTS += CFLAGS NCURSES_HEADERS TEST_SCRIPTS = -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod @@ -85,7 +83,7 @@ RUNTIME_DEP_PKGS_CSWpidgin += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilc1-1-2 RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsilcclient1-1-3 -#RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWpidgin += CSWlibsasl2-2 BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibxml2-dev @@ -110,12 +108,13 @@ BUILD_DEP_PKGS += CSWmeanwhile-dev BUILD_DEP_PKGS += CSWlibsilc-dev BUILD_DEP_PKGS += CSWgstreamer-dev -#BUILD_DEP_PKGS += CSWsasl-dev +BUILD_DEP_PKGS += CSWsasl-dev PATCHFILES += patch-pidgin-Makefile.in PATCHFILES += patch-pidgin-plugin.c PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in +PATCHFILES += 0004-irc-with-sasl.patch CHECKPKG_OVERRIDES_CSWpidgin += file-with-bad-content|/usr/local|root/opt/csw/lib/pidgin/musicmessaging.so CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libgnt.so Added: csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch =================================================================== --- csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch (rev 0) +++ csw/mgar/pkg/pidgin/trunk/files/0004-irc-with-sasl.patch 2013-10-24 08:41:22 UTC (rev 22296) @@ -0,0 +1,12 @@ +index b39690d..d362782 100644 +--- a/libpurple/protocols/irc/Makefile.in ++++ b/libpurple/protocols/irc/Makefile.in +@@ -105,7 +105,7 @@ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@) + am__v_lt_0 = --silent + libirc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libirc_la_CFLAGS) \ +- $(CFLAGS) $(libirc_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CFLAGS) $(libirc_la_LDFLAGS) $(LDFLAGS) $(SASL_LIBS) -o $@ + @STATIC_IRC_FALSE at am_libirc_la_rpath = -rpath $(pkgdir) + @STATIC_IRC_TRUE at am_libirc_la_rpath = + DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) 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 Oct 24 11:30:26 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 24 Oct 2013 09:30:26 +0000 Subject: SF.net SVN: gar:[22297] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 22297 http://gar.svn.sourceforge.net/gar/?rev=22297&view=rev Author: dmichelsen Date: 2013-10-24 09:30:24 +0000 (Thu, 24 Oct 2013) Log Message: ----------- sqlite3/trunk: Update to 3080100 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 2013-10-24 08:41:22 UTC (rev 22296) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2013-10-24 09:30:24 UTC (rev 22297) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3071602 +VERSION = 3080100 GARTYPE = v2 DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2013-10-24 08:41:22 UTC (rev 22296) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2013-10-24 09:30:24 UTC (rev 22297) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -ce7d2bc0d9b8dd18995b888c6b0b220f sqlite-autoconf-3071602.tar.gz +8b5a0a02dfcb0c7daf90856a5cfd485a sqlite-autoconf-3080100.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Oct 24 14:35:41 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 24 Oct 2013 12:35:41 +0000 Subject: SF.net SVN: gar:[22298] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22298 http://gar.svn.sourceforge.net/gar/?rev=22298&view=rev Author: lblume Date: 2013-10-24 12:35:40 +0000 (Thu, 24 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: fix mistake in the mysqld_safescript adjustment; reinstate Studio 12 (for now) as the compiler, GCC4 is faster, but will be the default later; disable specific ISA, they're not faster 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 2013-10-24 09:30:24 UTC (rev 22297) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-24 12:35:40 UTC (rev 22298) @@ -21,14 +21,15 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -#PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Keep Studio 12.0 for old S9 only ifneq ($(shell /usr/bin/uname -r),5.9) - GARCOMPILER = GCC4 + GARCOMPILER = SOS12U3 # Try to get some more oomph out of a sparc - EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9+vis2 + # Benchmarks w/ 5.5.34 show no obvious benefit, so disabled for now + #EXTRA_BUILD_ISAS_sparc = sparcv9+vis2 endif # There is some assembler code, which doesn't work on sparcv8, and I don't see @@ -51,27 +52,32 @@ (Structured Query Language) database server. endef +### For Studio 12.3 # Those options follow those of the Solaris 11 build # https://java.net/projects/solaris-userland/sources/gate/show/components/mysql-5-1?rev=1502 -#EXTRA_CXXFLAGS_64 += -features=no%except +EXTRA_CXXFLAGS_64 += -features=no%except # Required at -xO4 # https://java.net/projects/solaris-userland/sources/gate/content/make-rules/shared-macros.mk?rev=1505` -#EXTRA_CFLAGS_sparc += -xregs=no%appl -EXTRA_CFLAGS_sparc += -mno-app-regs +EXTRA_CFLAGS_sparc += -xregs=no%appl EXTRA_CFLAGS_i386 += -xregs=no%frameptr -#EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) -#EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) -EXTRA_CFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) -EXTRA_CXXFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +EXTRA_CFLAGS += -xstrconst -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -xnorunpath -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CXXFLAGS += -noex -xprefetch=auto -xprefetch_level=3 -fns=no -fsimple=1 -xbuiltin=%none -xlibmil -xlibmopt -mt -KPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) +### For GCC4 +#EXTRA_CFLAGS_sparc += -mno-app-regs + +#EXTRA_CFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CFLAGS_$(GARCH)) +#EXTRA_CXXFLAGS += -pthread -fPIC -DPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm $(EXTRA_CXXFLAGS_$(MEMORYMODEL)) + # The Solaris 11 build uses -xO4 by default -#OPT_FLAGS_SOS_32 = -xO4 -#OPT_FLAGS_SOS_64 = -xO4 -#OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s -#OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s -#OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(ISA)) +OPT_FLAGS_SOS_32 = -xO4 +OPT_FLAGS_SOS_64 = -xO4 +OPT_FLAGS_SOS_sparc_32 = -xmemalign=8s +OPT_FLAGS_SOS_sparc_64 = -xmemalign=16s +OPT_FLAGS_SOS += $(OPT_FLAGS_SOS_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_SOS_$(ISA)) + OPT_FLAGS_GCC4_32 = -O3 OPT_FLAGS_GCC4_64 = -O3 OPT_FLAGS_GCC4 += $(OPT_FLAGS_GCC4_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(GARCH)_$(MEMORYMODEL)) $(OPT_FLAGS_GCC4_$(ISA)) @@ -83,6 +89,8 @@ # The daemon to launch is selected by script, should not be automatic # Some other files too should probably not be isaexec'd EXTRA_ISAEXEC_EXCLUDE_FILES = /opt/csw/libexec/mysqld +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_safe +EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_multi EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/my_print_defaults EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqlaccess.conf @@ -150,8 +158,9 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 +### For GCC4 +#RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 +#RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we @@ -171,9 +180,10 @@ RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +### For GCC4 +#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 +#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 +#RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -373,7 +383,7 @@ gsed -i \ -e 's|bin/$(MM_BINDIR)|bin/$(ISABINDIR)/|g' \ -e 's|sbin/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \ - -e 's|libexec/$(MM_BINDIR)|sbin/$(ISABINDIR)|g' \ + -e 's|libexec/$(MM_BINDIR)|libexec/$(ISABINDIR)|g' \ $(DESTDIR)$(bindir)/$$file; \ done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Thu Oct 24 21:04:28 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 24 Oct 2013 19:04:28 +0000 Subject: SF.net SVN: gar:[22299] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 22299 http://gar.svn.sourceforge.net/gar/?rev=22299&view=rev Author: lblume Date: 2013-10-24 19:04:27 +0000 (Thu, 24 Oct 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: GCC4 dep still enabled 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 2013-10-24 12:35:40 UTC (rev 22298) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-10-24 19:04:27 UTC (rev 22299) @@ -121,7 +121,8 @@ RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.9 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibgcc-s1 +# For GCC4 +#RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibgcc-s1 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) 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 Oct 25 11:51:54 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 09:51:54 +0000 Subject: SF.net SVN: gar:[22300] csw/mgar/pkg/ca_certificates/trunk/files/ CSWcacertificates.postinstall Message-ID: Revision: 22300 http://gar.svn.sourceforge.net/gar/?rev=22300&view=rev Author: chninkel Date: 2013-10-25 09:51:51 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: remove nfs workaround as certificates are now under /etc Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2013-10-24 19:04:27 UTC (rev 22299) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2013-10-25 09:51:51 UTC (rev 22300) @@ -1,16 +1,3 @@ -# workaround to not fail if /opt/csw is read-only -# in the nfs-shared or sparse zone case -# this is temporary until configuration is moved in /etc/opt/csw -if touch /opt/csw/.ca_certificate.test 2>/dev/null; then - rm -f /opt/csw/.ca_certificate.test -else - echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated." - echo " If /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have" - echo " to worry about it, the certification authorities list present on the nfs server or in" - echo " the global zone will be used." - exit 0 -fi - # Update ca lists if [ -n "${BASEDIR}" ]; then chroot ${BASEDIR} /opt/csw/sbin/update-ca-certificates 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 Oct 25 11:52:16 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 09:52:16 +0000 Subject: SF.net SVN: gar:[22301] csw/mgar/pkg/ca_certificates/trunk/files/ CSWcacertificates.postinstall Message-ID: Revision: 22301 http://gar.svn.sourceforge.net/gar/?rev=22301&view=rev Author: chninkel Date: 2013-10-25 09:52:16 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: fix alternate root installation Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2013-10-25 09:51:51 UTC (rev 22300) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2013-10-25 09:52:16 UTC (rev 22301) @@ -1,6 +1,6 @@ # Update ca lists -if [ -n "${BASEDIR}" ]; then - chroot ${BASEDIR} /opt/csw/sbin/update-ca-certificates +if [ -n "${PKG_INSTALL_ROOT}" ]; then + chroot "${PKG_INSTALL_ROOT}" /opt/csw/sbin/update-ca-certificates else /opt/csw/sbin/update-ca-certificates fi 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 Oct 25 11:52:39 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 09:52:39 +0000 Subject: SF.net SVN: gar:[22302] csw/mgar/pkg/ca_certificates/trunk/checksums Message-ID: Revision: 22302 http://gar.svn.sourceforge.net/gar/?rev=22302&view=rev Author: chninkel Date: 2013-10-25 09:52:38 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: update certificate list Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2013-10-25 09:52:16 UTC (rev 22301) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2013-10-25 09:52:38 UTC (rev 22302) @@ -1 +1 @@ -c8fa899f4abbef043ea2b4143a78c935 certdata.txt +2bb61a6db50b3a80782ba7500d6fa46d certdata.txt 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 Oct 25 11:58:30 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 09:58:30 +0000 Subject: SF.net SVN: gar:[22303] csw/mgar/pkg/ca_certificates/trunk/files/ CSWcacertificates.postremove Message-ID: Revision: 22303 http://gar.svn.sourceforge.net/gar/?rev=22303&view=rev Author: chninkel Date: 2013-10-25 09:58:30 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: update postinstall script to take into account the configuration location migration Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2013-10-25 09:52:38 UTC (rev 22302) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2013-10-25 09:58:30 UTC (rev 22303) @@ -2,7 +2,7 @@ # We remove all dead links in /opt/csw/etc/ssl/certs/, # that should remove all the links to the cerfificates # provided in this package -find /opt/csw/etc/ssl/certs/ -type l | while read FILE; do +find /etc/opt/csw/ssl/certs/ -type l | while read FILE; do [ -f "$FILE" ] || rm -f "$FILE" done rm -f /opt/csw/etc/ssl/certs/ca-certificates.crt 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 Oct 25 12:00:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 10:00:33 +0000 Subject: SF.net SVN: gar:[22304] csw/mgar/pkg/ca_certificates/trunk/files/ CSWcacertificates.postremove Message-ID: Revision: 22304 http://gar.svn.sourceforge.net/gar/?rev=22304&view=rev Author: chninkel Date: 2013-10-25 10:00:32 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: add support for alternate root in postinstall script Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2013-10-25 09:58:30 UTC (rev 22303) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2013-10-25 10:00:32 UTC (rev 22304) @@ -2,9 +2,9 @@ # We remove all dead links in /opt/csw/etc/ssl/certs/, # that should remove all the links to the cerfificates # provided in this package -find /etc/opt/csw/ssl/certs/ -type l | while read FILE; do +find "${PKG_INSTALL_ROOT}/etc/opt/csw/ssl/certs/" -type l | while read FILE; do [ -f "$FILE" ] || rm -f "$FILE" done -rm -f /opt/csw/etc/ssl/certs/ca-certificates.crt +rm -f "${PKG_INSTALL_ROOT}/etc/opt/csw/ssl/certs/ca-certificates.crt" exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Oct 25 12:01:10 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 25 Oct 2013 10:01:10 +0000 Subject: SF.net SVN: gar:[22305] csw/mgar/pkg/ca_certificates/trunk/checksums Message-ID: Revision: 22305 http://gar.svn.sourceforge.net/gar/?rev=22305&view=rev Author: chninkel Date: 2013-10-25 10:01:09 +0000 (Fri, 25 Oct 2013) Log Message: ----------- ca_certificates/trunk: update certificates list again Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2013-10-25 10:00:32 UTC (rev 22304) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2013-10-25 10:01:09 UTC (rev 22305) @@ -1 +1 @@ -2bb61a6db50b3a80782ba7500d6fa46d certdata.txt +c8fa899f4abbef043ea2b4143a78c935 certdata.txt 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 Oct 25 14:04:02 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Oct 2013 12:04:02 +0000 Subject: SF.net SVN: gar:[22306] csw/mgar/pkg/buildbot/trunk/Makefile Message-ID: Revision: 22306 http://gar.svn.sourceforge.net/gar/?rev=22306&view=rev Author: dmichelsen Date: 2013-10-25 12:04:02 +0000 (Fri, 25 Oct 2013) Log Message: ----------- buildbot/trunk: Prefer XPG4 tail over GNU tail Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-25 10:01:09 UTC (rev 22305) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-25 12:04:02 UTC (rev 22306) @@ -30,7 +30,6 @@ PACKAGES += CSWbuildbot SPKG_DESC_CSWbuildbot = A system to automate the compile/test cycle # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWbuildbot += CSWcoreutils RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-twisted RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-zope-interface RUNTIME_DEP_PKGS_CSWbuildbot += CSWpy-sqlalchemy @@ -41,7 +40,6 @@ CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-sqlalchemy -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWcoreutils CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-zope-interface CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-jinja2 CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-tempita @@ -54,6 +52,12 @@ ARCHALL_CSWbuildbot = 1 +# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4 +REINPLACEMENTS += tail +REINPLACE_MATCH_tail = /usr/bin/tail +REINPLACE_WITH_tail = /usr/xpg4/bin/tail +REINPLACE_FILES_tail += buildbot/scripts/logwatcher.py + # There seems to be 'trial' missing SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 25 14:05:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Oct 2013 12:05:42 +0000 Subject: SF.net SVN: gar:[22307] csw/mgar/pkg/buildbot-slave/trunk/Makefile Message-ID: Revision: 22307 http://gar.svn.sourceforge.net/gar/?rev=22307&view=rev Author: dmichelsen Date: 2013-10-25 12:05:41 +0000 (Fri, 25 Oct 2013) Log Message: ----------- buildbot-slave/trunk: Use XPG4 tail Modified Paths: -------------- csw/mgar/pkg/buildbot-slave/trunk/Makefile Modified: csw/mgar/pkg/buildbot-slave/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-25 12:04:02 UTC (rev 22306) +++ csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-25 12:05:41 UTC (rev 22307) @@ -15,12 +15,21 @@ PACKAGES += CSWbuildbot-slave SPKG_DESC_CSWbuildbot-slave = BuildBot Slave Daemon # PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWbuildbot-slave += CSWpy-twisted +CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted + ARCHALL_CSWbuildbot-slave = 1 # This is more like an application than a python module CHECKPKG_OVERRIDES_CSWbuildbot-slave += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWbuildbot-slave += catalogname-does-not-start-with-py_ +# logwatcher uses 'tail -f -n 0' only available on XPG4 tail or GNU tail, let's prefer XPG4 +REINPLACEMENTS += tail +REINPLACE_MATCH_tail = /usr/bin/tail +REINPLACE_WITH_tail = /usr/xpg4/bin/tail +REINPLACE_FILES_tail += buildslave/scripts/logwatcher.py + # There seems to be 'trial' missing SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Oct 25 14:08:45 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Oct 2013 12:08:45 +0000 Subject: SF.net SVN: gar:[22308] csw/mgar/pkg/buildbot-slave/trunk Message-ID: Revision: 22308 http://gar.svn.sourceforge.net/gar/?rev=22308&view=rev Author: dmichelsen Date: 2013-10-25 12:08:44 +0000 (Fri, 25 Oct 2013) Log Message: ----------- buildbot-slave/trunk: Fix typo, remove unneeded files Modified Paths: -------------- csw/mgar/pkg/buildbot-slave/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-debug.patch csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-tail.patch Modified: csw/mgar/pkg/buildbot-slave/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-25 12:05:41 UTC (rev 22307) +++ csw/mgar/pkg/buildbot-slave/trunk/Makefile 2013-10-25 12:08:44 UTC (rev 22308) @@ -16,7 +16,7 @@ SPKG_DESC_CSWbuildbot-slave = BuildBot Slave Daemon # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWbuildbot-slave += CSWpy-twisted -CHECKPKG_OVERRIDES_CSWbuildbot += surplus-dependency|CSWpy-twisted +CHECKPKG_OVERRIDES_CSWbuildbot-slave += surplus-dependency|CSWpy-twisted ARCHALL_CSWbuildbot-slave = 1 Deleted: csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-debug.patch =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-debug.patch 2013-10-25 12:05:41 UTC (rev 22307) +++ csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-debug.patch 2013-10-25 12:08:44 UTC (rev 22308) @@ -1,25 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py ---- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100 -@@ -73,6 +73,9 @@ - self.files = files[:] - self.files.sort() - -+ def __repr__(self): -+ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who) -+ - def asText(self): - data = "" - data += self.getFileContents() -diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py ---- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100 -@@ -287,6 +287,8 @@ - - def addChange(self, change): - branch = change.branch -+ log.msg("branch = %s" % repr(branch)) -+ log.msg("self.branches = %s" % repr(self.branches)) - if self.branches is not None and branch not in self.branches: - log.msg("%s ignoring off-branch %s" % (self, change)) - return Deleted: csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-tail.patch =================================================================== --- csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-tail.patch 2013-10-25 12:05:41 UTC (rev 22307) +++ csw/mgar/pkg/buildbot-slave/trunk/files/buildbot-tail.patch 2013-10-25 12:08:44 UTC (rev 22308) @@ -1,12 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py ---- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200 -@@ -43,7 +43,7 @@ - # been seen within 10 seconds, and with ReconfigError if the error - # line was seen. If the logfile could not be opened, it errbacks with - # an IOError. -- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail", -+ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail", - ("tail", "-f", "-n", "0", self.logfile), - env=os.environ, - ) 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 Oct 25 14:09:22 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 25 Oct 2013 12:09:22 +0000 Subject: SF.net SVN: gar:[22309] csw/mgar/pkg/buildbot/trunk Message-ID: Revision: 22309 http://gar.svn.sourceforge.net/gar/?rev=22309&view=rev Author: dmichelsen Date: 2013-10-25 12:09:22 +0000 (Fri, 25 Oct 2013) Log Message: ----------- buildbot/trunk: Remove unnecessary patches, now done via REINPLACEMENT Modified Paths: -------------- csw/mgar/pkg/buildbot/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch Modified: csw/mgar/pkg/buildbot/trunk/Makefile =================================================================== --- csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-25 12:08:44 UTC (rev 22308) +++ csw/mgar/pkg/buildbot/trunk/Makefile 2013-10-25 12:09:22 UTC (rev 22309) @@ -23,8 +23,6 @@ endef MASTER_SITES = $(PYPI_MIRROR) -PATCHFILES = buildbot-tail.patch -#PATCHFILES += buildbot-debug.patch DISTFILES += $(DISTNAME).tar.gz PACKAGES += CSWbuildbot Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch 2013-10-25 12:08:44 UTC (rev 22308) +++ csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch 2013-10-25 12:09:22 UTC (rev 22309) @@ -1,25 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py ---- buildbot-0.7.11p1.orig/buildbot/changes/changes.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/changes/changes.py 2009-07-30 13:30:01.632031291 +0100 -@@ -73,6 +73,9 @@ - self.files = files[:] - self.files.sort() - -+ def __repr__(self): -+ return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who) -+ - def asText(self): - data = "" - data += self.getFileContents() -diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py ---- buildbot-0.7.11p1.orig/buildbot/scheduler.py 2009-07-15 20:09:30.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scheduler.py 2009-07-30 16:56:59.195283110 +0100 -@@ -287,6 +287,8 @@ - - def addChange(self, change): - branch = change.branch -+ log.msg("branch = %s" % repr(branch)) -+ log.msg("self.branches = %s" % repr(self.branches)) - if self.branches is not None and branch not in self.branches: - log.msg("%s ignoring off-branch %s" % (self, change)) - return Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch =================================================================== --- csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch 2013-10-25 12:08:44 UTC (rev 22308) +++ csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch 2013-10-25 12:09:22 UTC (rev 22309) @@ -1,12 +0,0 @@ -diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py ---- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py 2009-03-02 18:13:03.000000000 +0100 -+++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py 2009-07-29 18:00:44.304903854 +0200 -@@ -43,7 +43,7 @@ - # been seen within 10 seconds, and with ReconfigError if the error - # line was seen. If the logfile could not be opened, it errbacks with - # an IOError. -- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail", -+ self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail", - ("tail", "-f", "-n", "0", self.logfile), - env=os.environ, - ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Oct 26 14:13:03 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 26 Oct 2013 12:13:03 +0000 Subject: SF.net SVN: gar:[22310] csw/mgar/pkg Message-ID: Revision: 22310 http://gar.svn.sourceforge.net/gar/?rev=22310&view=rev Author: lblume Date: 2013-10-26 12:13:02 +0000 (Sat, 26 Oct 2013) Log Message: ----------- rt/trunk: Start some work on RT 4.2.0 Added Paths: ----------- csw/mgar/pkg/rt/ csw/mgar/pkg/rt/Makefile csw/mgar/pkg/rt/branches/ csw/mgar/pkg/rt/tags/ csw/mgar/pkg/rt/trunk/ csw/mgar/pkg/rt/trunk/Makefile csw/mgar/pkg/rt/trunk/checksums csw/mgar/pkg/rt/trunk/files/ csw/mgar/pkg/rt/trunk/files/cswusergroup Added: csw/mgar/pkg/rt/Makefile =================================================================== --- csw/mgar/pkg/rt/Makefile (rev 0) +++ csw/mgar/pkg/rt/Makefile 2013-10-26 12:13:02 UTC (rev 22310) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/rt/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/rt/trunk/Makefile =================================================================== --- csw/mgar/pkg/rt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rt/trunk/Makefile 2013-10-26 12:13:02 UTC (rev 22310) @@ -0,0 +1,80 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = rt +VERSION = 4.2.0 +GARTYPE = v2 + +DESCRIPTION = RT: Request Tracker, an enterprise-grade issue tracking system. +define BLURB + RT is an enterprise-grade issue tracking system. It allows organizations +to keep track of what needs to get done, who is working on which tasks, +what's already been done, and when tasks were (or weren't) completed. +endef + +GARCOMPILER = GCC4 + +VENDOR_URL = http://bestpractical.com/rt/ +MASTER_SITES = http://download.bestpractical.com/pub/rt/release/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += cswusergroup + +USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup + +BUILD_DEP_PKGS += CSWgraphviz-dev +BUILD_DEP_PKGS += CSWlibgd-dev +BUILD_DEP_PKGS += CSWpmcryptblowfish +BUILD_DEP_PKGS += CSWpmfcgi +BUILD_DEP_PKGS += CSWpmhtmlscrubber +BUILD_DEP_PKGS += CSWpmmimetypes +BUILD_DEP_PKGS += CSWpmperlioeol +BUILD_DEP_PKGS += CSWpmregexpcommon +BUILD_DEP_PKGS += CSWpmtextwikiformat +BUILD_DEP_PKGS += CSWpmtextwrapper +BUILD_DEP_PKGS += CSWpmtreesimple +BUILD_DEP_PKGS += CSWpmxmlrss? +BUILD_DEP_PKGS += CSWpm-cgi-emulate-psgi +BUILD_DEP_PKGS += CSWpm-css-squish +BUILD_DEP_PKGS += CSWpm-devel-stacktrace +BUILD_DEP_PKGS += CSWpm-devel-globaldestruction +BUILD_DEP_PKGS += CSWpm-datetime +BUILD_DEP_PKGS += CSWpm-dbd-mysql +BUILD_DEP_PKGS += CSWpm-dbi +BUILD_DEP_PKGS += CSWpm-dbix-searchbuilder +BUILD_DEP_PKGS += CSWpm-email-address +BUILD_DEP_PKGS += CSWpm-gd +BUILD_DEP_PKGS += CSWpm-html-format +BUILD_DEP_PKGS += CSWpm-ipc-run +BUILD_DEP_PKGS += CSWpm-ipc-run3 +BUILD_DEP_PKGS += CSWpm-json +BUILD_DEP_PKGS += CSWpm-log-dispatch +BUILD_DEP_PKGS += CSWpm-lwp-protocol-https +BUILD_DEP_PKGS += CSWpm-mime-tools +BUILD_DEP_PKGS += CSWpm-module-refresh +BUILD_DEP_PKGS += CSWpm-net-cidr +BUILD_DEP_PKGS += CSWpm-plack +BUILD_DEP_PKGS += CSWpm-text-template +BUILD_DEP_PKGS += CSWpm-universal-require + +PACKAGES += CSWrt +SPKG_DESC_CSWrt = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWrt += CSWperl + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-graphviz +CONFIGURE_ARGS += --enable-gd +CONFIGURE_ARGS += --enable-gpg +CONFIGURE_ARGS += --enable-smime +CONFIGURE_ARGS += --with-web-user=webservd +CONFIGURE_ARGS += --with-web-group=webservd +CONFIGURE_ARGS += --with-rt-group=rt + +include gar/category.mk + +TEST_TARGET = test + +post-merge: + ginstall -m 644 $(FILEDIR)/cswusergroup \ + $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) + Property changes on: csw/mgar/pkg/rt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/rt/trunk/checksums =================================================================== --- csw/mgar/pkg/rt/trunk/checksums (rev 0) +++ csw/mgar/pkg/rt/trunk/checksums 2013-10-26 12:13:02 UTC (rev 22310) @@ -0,0 +1 @@ +98fcc484a37c62f0c202f3cc1fbefb89 rt-4.2.0.tar.gz Added: csw/mgar/pkg/rt/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/rt/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/rt/trunk/files/cswusergroup 2013-10-26 12:13:02 UTC (rev 22310) @@ -0,0 +1 @@ +rt:rt:RT user:/var/opt/csw/rt:/bin/false:: 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 Oct 26 15:34:58 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 26 Oct 2013 13:34:58 +0000 Subject: SF.net SVN: gar:[22311] csw/mgar/pkg Message-ID: Revision: 22311 http://gar.svn.sourceforge.net/gar/?rev=22311&view=rev Author: guengel Date: 2013-10-26 13:34:56 +0000 (Sat, 26 Oct 2013) Log Message: ----------- pg-ip4r/trunk: Initial commit. Added Paths: ----------- csw/mgar/pkg/pg-ip4r/ csw/mgar/pkg/pg-ip4r/Makefile csw/mgar/pkg/pg-ip4r/branches/ csw/mgar/pkg/pg-ip4r/tags/ csw/mgar/pkg/pg-ip4r/trunk/ csw/mgar/pkg/pg-ip4r/trunk/Makefile csw/mgar/pkg/pg-ip4r/trunk/checksums csw/mgar/pkg/pg-ip4r/trunk/files/ csw/mgar/pkg/pg-ip4r/trunk/files/README.CSW Added: csw/mgar/pkg/pg-ip4r/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/Makefile (rev 0) +++ csw/mgar/pkg/pg-ip4r/Makefile 2013-10-26 13:34:56 UTC (rev 22311) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pg-ip4r/Makefile ___________________________________________________________________ Added: svn:keywords + Date Revision Author HeadURL Id Added: svn:eol-style + native Property changes on: csw/mgar/pkg/pg-ip4r/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pg-ip4r/trunk/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 13:34:56 UTC (rev 22311) @@ -0,0 +1,149 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pg-ip4r +VERSION = 1.05 +GARTYPE = v2 +GARCOMPILER = SOS12U3 + +DESCRIPTION = Advanced cidr type for PostgreSQL +define BLURB + ip4 and ip4r are types that contain a single IPv4 address and a range of + IPv4 addresses respectively. They can be used as a more flexible, indexable + version of the cidr type. +endef + +# We do not donwload ip4r from pgfoundry.org, since they use fusionforge: +# the fusionforge download script requires an id for getting a file, e.g. +# +# http://pgfoundry.org/frs/download.php/3380/ip4r-2.0.tgz +# +# now the id is 3380. Everything after that id is ignored +# +# http://pgfoundry.org/frs/download.php/3380/foobar.tgz +# +# downloads the same file as the first example. +# +# If mgar tries to download ip4r-1.05.tar.gz and +# +# http://pgfoundry.org/frs/download.php/3380 +# +# is in master sites, it will succeed and download the wrong file. +# +# Therefore, ip4r-XY has to be downloaded manually and placed in the +# proper place. +MASTER_SITES = http://ftp.postgresql.org/pub/source/v8.3.23/ +MASTER_SITES += http://ftp.postgresql.org/pub/source/v8.4.18/ +MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.0.14/ +MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.1.10/ +MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.2.5/ +MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.3.1/ +DISTFILES = README.CSW +DISTFILES += postgresql-8.3.23.tar.gz +DISTFILES += postgresql-8.4.18.tar.gz +DISTFILES += postgresql-9.0.14.tar.gz +DISTFILES += postgresql-9.1.10.tar.gz +DISTFILES += postgresql-9.2.5.tar.gz +DISTFILES += postgresql-9.3.1.tar.gz +# This is only required for Postgres 8.3, since version 2.0 source +# references to numeric_div_trun() which is not available in 8.3 +DISTFILES += ip4r-1.05.tar.gz +# This is used for Postgres 8.4-9.0, which do not feature extension +# packaging mechanism +DISTFILES += ip4r-2.0.tgz +# This is used for Postgres 9.1+, which feature extension packaging +# mechanism +DISTFILES += ip4r-extension-2.0.tgz + +EXTRA_MODULATORS = PGVERSION +MODULATIONS_PGVERSION = 83 84 90 91 92 93 + +# Variables for PGVERSION modulations +PG_SOURCE_NAME_83 = postgresql-8.3.23 +PG_BASEVERSION_DOT_83 = 8.3 +IP4R_SOURCE_NAME_83 = ip4r-1.05 +CONFIGURE_ARGS_83 = --with-docdir=$(docdir)/postgresql/$(PGVERSION) + +PG_SOURCE_NAME_84 = postgresql-8.4.18 +PG_BASEVERSION_DOT_84 = 8.4 +IP4R_SOURCE_NAME_84 = ip4r-2.0 +CONFIGURE_ARGS_84 = --docdir=$(docdir)/postgresql/$(PGVERSION) + +PG_SOURCE_NAME_90 = postgresql-9.0.14 +PG_BASEVERSION_DOT_90 = 9.0 +IP4R_SOURCE_NAME_90 = ip4r-2.0 +CONFIGURE_ARGS_90 = --docdir=$(docdir)/postgresql/$(PGVERSION) + +PG_SOURCE_NAME_91 = postgresql-9.1.10 +PG_BASEVERSION_DOT_91 = 9.1 +IP4R_SOURCE_NAME_91 = ip4r-extension-2.0 +CONFIGURE_ARGS_91 = --docdir=$(docdir)/postgresql/$(PGVERSION) + +PG_SOURCE_NAME_92 = postgresql-9.2.5 +PG_BASEVERSION_DOT_92 = 9.2 +IP4R_SOURCE_NAME_92 = ip4r-extension-2.0 +CONFIGURE_ARGS_92 = --docdir=$(docdir)/postgresql/$(PGVERSION) + +PG_SOURCE_NAME_93 = postgresql-9.3.1 +PG_BASEVERSION_DOT_93 = 9.3 +IP4R_SOURCE_NAME_93 = ip4r-extension-2.0 +CONFIGURE_ARGS_93 = --docdir=$(docdir)/postgresql/$(PGVERSION) + +MERGE_SCRIPTS_$(MODULATION) = copy-relocate + + +PACKAGES = $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r) +$(foreach v,$(MODULATIONS_PGVERSION),\ + $(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\ + $(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.*)\ +) + +BUILD64 = 1 + +# We define NO_PGXS=1 so that pg_config is not called. This is the main reason we do it the hard way. +BUILD_ARGS = NO_PGXS=1 +INSTALL_ARGS = NO_PGXS=1 + +CONFIGURE_SCRIPTS = ip4r +BUILD_SCRIPTS = ip4r +INSTALL_SCRIPTS = ip4r +# Deliberately no check +TEST_SCRIPTS = + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --datadir=$(datadir)/postgresql/$(PGVERSION) +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_$(PGVERSION)) + +include gar/category.mk + +pre-configure-modulated: + cp -R $(WORKDIR)/$(IP4R_SOURCE_NAME_$(PGVERSION)) $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/contrib/ip4r +# Copy errcodes.h into src/include/utils/. Used to make builds for 9.1+ work + -cp $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/backend/utils/errcodes.h $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/include/utils/ + @echo " ===> Adjusting pkglibdir in $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in" + @if [ -r $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ] ; then \ + gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(PGVERSION)|' $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ; \ + else \ + echo "$(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in not found. Aborting" ; \ + exit 1 ; \ + fi + @$(MAKECOOKIE) + +configure-ip4r: + cd $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/ && env $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + @$(MAKECOOKIE) + +build-ip4r: + cd $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/contrib/ip4r && env $(BUILD_ENV) gmake $(BUILD_ARGS) + @$(MAKECOOKIE) + +install-ip4r: + cd $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/contrib/ip4r && env $(INSTALL_ENV) gmake install $(INSTALL_ARGS) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/pg-ip4r/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: csw/mgar/pkg/pg-ip4r/trunk/checksums =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/checksums (rev 0) +++ csw/mgar/pkg/pg-ip4r/trunk/checksums 2013-10-26 13:34:56 UTC (rev 22311) @@ -0,0 +1,9 @@ +be4c4b0fbf91eac6b3bc2330d065f4cd ip4r-1.05.tar.gz +d9de4c712a354bfc77d7383d2a04215c ip4r-2.0.tgz +a17d5b5314eba314ef9d255cf16e48bd ip4r-extension-2.0.tgz +822360229618e4e5965182ac01cc6ca3 postgresql-8.3.23.tar.gz +2fa850ea2e83e390efceedb60eaf6537 postgresql-8.4.18.tar.gz +a1a5c6e975e269cff3dac144b9c3ad0e postgresql-9.0.14.tar.gz +0bc70c103de99b8f12e9086eb96c44c8 postgresql-9.1.10.tar.gz +48854ef39a96a22a3aff964817594a28 postgresql-9.2.5.tar.gz +58edfab25d6bb243ff2c8bf2d2df34d3 postgresql-9.3.1.tar.gz Added: csw/mgar/pkg/pg-ip4r/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/pg-ip4r/trunk/files/README.CSW 2013-10-26 13:34:56 UTC (rev 22311) @@ -0,0 +1,47 @@ +README +====== + +You find the README.ip4r included in the source distribution in +/opt/csw/share/doc/postgresql//contrib/. + + +Installation +============ + +See also README.ip4r. + + +PostgreSQL Version < 9.1 +------------------------ + +psql- -U postgres -f /opt/csw/share/postgresql//contrib/ip4r.sql + + * is the PostgreSQL version without dot: + + 8.3.Z -> 83 + 8.4.Z -> 84 + 9.0.Z -> 90 + + * is the name of the database. + +It is not strictly necessary to use the `postgres' user when calling +psql-. Any user with administrator privileges on the database +should do. + + +PostgreSQL Version >= 9.1 +------------------------- + +psql- -U postgres -c 'CREATE EXTENSION ip4r' + + * is the PostgreSQL version without dot: + + 9.1.Z -> 91 + 9.2.Z -> 92 + 9.3.Z -> 93 + + * is the name of the database. + +It is not strictly necessary to use the `postgres' user when calling +psql-. Any user with administrator privileges on the database +should do. \ 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 Oct 26 16:26:29 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 26 Oct 2013 14:26:29 +0000 Subject: SF.net SVN: gar:[22312] csw/mgar/pkg/pg-ip4r/trunk Message-ID: Revision: 22312 http://gar.svn.sourceforge.net/gar/?rev=22312&view=rev Author: guengel Date: 2013-10-26 14:26:29 +0000 (Sat, 26 Oct 2013) Log Message: ----------- pg-ip4r/trunk: Moved build for postgresql 8.3 into a different branch. Set VERSION to 2.0. Added BUILD_DEPs. Modified Paths: -------------- csw/mgar/pkg/pg-ip4r/trunk/Makefile csw/mgar/pkg/pg-ip4r/trunk/checksums Modified: csw/mgar/pkg/pg-ip4r/trunk/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 13:34:56 UTC (rev 22311) +++ csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 14:26:29 UTC (rev 22312) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pg-ip4r -VERSION = 1.05 +VERSION = 2.0 GARTYPE = v2 GARCOMPILER = SOS12U3 @@ -32,22 +32,17 @@ # # Therefore, ip4r-XY has to be downloaded manually and placed in the # proper place. -MASTER_SITES = http://ftp.postgresql.org/pub/source/v8.3.23/ MASTER_SITES += http://ftp.postgresql.org/pub/source/v8.4.18/ MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.0.14/ MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.1.10/ MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.2.5/ MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.3.1/ DISTFILES = README.CSW -DISTFILES += postgresql-8.3.23.tar.gz DISTFILES += postgresql-8.4.18.tar.gz DISTFILES += postgresql-9.0.14.tar.gz DISTFILES += postgresql-9.1.10.tar.gz DISTFILES += postgresql-9.2.5.tar.gz DISTFILES += postgresql-9.3.1.tar.gz -# This is only required for Postgres 8.3, since version 2.0 source -# references to numeric_div_trun() which is not available in 8.3 -DISTFILES += ip4r-1.05.tar.gz # This is used for Postgres 8.4-9.0, which do not feature extension # packaging mechanism DISTFILES += ip4r-2.0.tgz @@ -56,14 +51,9 @@ DISTFILES += ip4r-extension-2.0.tgz EXTRA_MODULATORS = PGVERSION -MODULATIONS_PGVERSION = 83 84 90 91 92 93 +MODULATIONS_PGVERSION = 84 90 91 92 93 # Variables for PGVERSION modulations -PG_SOURCE_NAME_83 = postgresql-8.3.23 -PG_BASEVERSION_DOT_83 = 8.3 -IP4R_SOURCE_NAME_83 = ip4r-1.05 -CONFIGURE_ARGS_83 = --with-docdir=$(docdir)/postgresql/$(PGVERSION) - PG_SOURCE_NAME_84 = postgresql-8.4.18 PG_BASEVERSION_DOT_84 = 8.4 IP4R_SOURCE_NAME_84 = ip4r-2.0 @@ -95,9 +85,22 @@ PACKAGES = $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r) $(foreach v,$(MODULATIONS_PGVERSION),\ $(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\ - $(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.*)\ + $(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.* .*/pg$(v)_ip4r/.*README.CSW)\ ) +BUILD_DEP_PKGS = CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe +BUILD_DEP_PKGS += CSWlibz-dev + +# Needed for thread safety check by configure +LIBS = -lrt +EXTRA_CONFIGURE_ENV = LIBS=$(LIBS) + BUILD64 = 1 # We define NO_PGXS=1 so that pg_config is not called. This is the main reason we do it the hard way. Modified: csw/mgar/pkg/pg-ip4r/trunk/checksums =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/checksums 2013-10-26 13:34:56 UTC (rev 22311) +++ csw/mgar/pkg/pg-ip4r/trunk/checksums 2013-10-26 14:26:29 UTC (rev 22312) @@ -1,7 +1,5 @@ -be4c4b0fbf91eac6b3bc2330d065f4cd ip4r-1.05.tar.gz d9de4c712a354bfc77d7383d2a04215c ip4r-2.0.tgz a17d5b5314eba314ef9d255cf16e48bd ip4r-extension-2.0.tgz -822360229618e4e5965182ac01cc6ca3 postgresql-8.3.23.tar.gz 2fa850ea2e83e390efceedb60eaf6537 postgresql-8.4.18.tar.gz a1a5c6e975e269cff3dac144b9c3ad0e postgresql-9.0.14.tar.gz 0bc70c103de99b8f12e9086eb96c44c8 postgresql-9.1.10.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 Sat Oct 26 16:27:57 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 26 Oct 2013 14:27:57 +0000 Subject: SF.net SVN: gar:[22313] csw/mgar/pkg/pg-ip4r/branches Message-ID: Revision: 22313 http://gar.svn.sourceforge.net/gar/?rev=22313&view=rev Author: guengel Date: 2013-10-26 14:27:56 +0000 (Sat, 26 Oct 2013) Log Message: ----------- pg-ip4r/branches/ip4r-1.05: This branch is only used for postgres 8.3 builds since 8.3 only works with ip4r 1.05. Added BUILD_DEPs. Modified Paths: -------------- csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums Added Paths: ----------- csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/ Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 13:34:56 UTC (rev 22311) +++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile 2013-10-26 14:27:56 UTC (rev 22313) @@ -33,30 +33,14 @@ # Therefore, ip4r-XY has to be downloaded manually and placed in the # proper place. MASTER_SITES = http://ftp.postgresql.org/pub/source/v8.3.23/ -MASTER_SITES += http://ftp.postgresql.org/pub/source/v8.4.18/ -MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.0.14/ -MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.1.10/ -MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.2.5/ -MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.3.1/ DISTFILES = README.CSW DISTFILES += postgresql-8.3.23.tar.gz -DISTFILES += postgresql-8.4.18.tar.gz -DISTFILES += postgresql-9.0.14.tar.gz -DISTFILES += postgresql-9.1.10.tar.gz -DISTFILES += postgresql-9.2.5.tar.gz -DISTFILES += postgresql-9.3.1.tar.gz # This is only required for Postgres 8.3, since version 2.0 source # references to numeric_div_trun() which is not available in 8.3 DISTFILES += ip4r-1.05.tar.gz -# This is used for Postgres 8.4-9.0, which do not feature extension -# packaging mechanism -DISTFILES += ip4r-2.0.tgz -# This is used for Postgres 9.1+, which feature extension packaging -# mechanism -DISTFILES += ip4r-extension-2.0.tgz EXTRA_MODULATORS = PGVERSION -MODULATIONS_PGVERSION = 83 84 90 91 92 93 +MODULATIONS_PGVERSION = 83 # Variables for PGVERSION modulations PG_SOURCE_NAME_83 = postgresql-8.3.23 @@ -64,40 +48,28 @@ IP4R_SOURCE_NAME_83 = ip4r-1.05 CONFIGURE_ARGS_83 = --with-docdir=$(docdir)/postgresql/$(PGVERSION) -PG_SOURCE_NAME_84 = postgresql-8.4.18 -PG_BASEVERSION_DOT_84 = 8.4 -IP4R_SOURCE_NAME_84 = ip4r-2.0 -CONFIGURE_ARGS_84 = --docdir=$(docdir)/postgresql/$(PGVERSION) - -PG_SOURCE_NAME_90 = postgresql-9.0.14 -PG_BASEVERSION_DOT_90 = 9.0 -IP4R_SOURCE_NAME_90 = ip4r-2.0 -CONFIGURE_ARGS_90 = --docdir=$(docdir)/postgresql/$(PGVERSION) - -PG_SOURCE_NAME_91 = postgresql-9.1.10 -PG_BASEVERSION_DOT_91 = 9.1 -IP4R_SOURCE_NAME_91 = ip4r-extension-2.0 -CONFIGURE_ARGS_91 = --docdir=$(docdir)/postgresql/$(PGVERSION) - -PG_SOURCE_NAME_92 = postgresql-9.2.5 -PG_BASEVERSION_DOT_92 = 9.2 -IP4R_SOURCE_NAME_92 = ip4r-extension-2.0 -CONFIGURE_ARGS_92 = --docdir=$(docdir)/postgresql/$(PGVERSION) - -PG_SOURCE_NAME_93 = postgresql-9.3.1 -PG_BASEVERSION_DOT_93 = 9.3 -IP4R_SOURCE_NAME_93 = ip4r-extension-2.0 -CONFIGURE_ARGS_93 = --docdir=$(docdir)/postgresql/$(PGVERSION) - MERGE_SCRIPTS_$(MODULATION) = copy-relocate PACKAGES = $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r) $(foreach v,$(MODULATIONS_PGVERSION),\ $(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\ - $(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.*)\ + $(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.* .*/pg$(v)_ip4r/.*README.CSW)\ ) +BUILD_DEP_PKGS = CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe +BUILD_DEP_PKGS += CSWlibz-dev + +# Needed for thread safety check by configure +LIBS = -lrt +EXTRA_CONFIGURE_ENV = LIBS=$(LIBS) + BUILD64 = 1 # We define NO_PGXS=1 so that pg_config is not called. This is the main reason we do it the hard way. @@ -125,8 +97,6 @@ pre-configure-modulated: cp -R $(WORKDIR)/$(IP4R_SOURCE_NAME_$(PGVERSION)) $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/contrib/ip4r -# Copy errcodes.h into src/include/utils/. Used to make builds for 9.1+ work - -cp $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/backend/utils/errcodes.h $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/include/utils/ @echo " ===> Adjusting pkglibdir in $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in" @if [ -r $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ] ; then \ gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(PGVERSION)|' $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ; \ Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/checksums 2013-10-26 13:34:56 UTC (rev 22311) +++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums 2013-10-26 14:27:56 UTC (rev 22313) @@ -1,9 +1,2 @@ be4c4b0fbf91eac6b3bc2330d065f4cd ip4r-1.05.tar.gz -d9de4c712a354bfc77d7383d2a04215c ip4r-2.0.tgz -a17d5b5314eba314ef9d255cf16e48bd ip4r-extension-2.0.tgz 822360229618e4e5965182ac01cc6ca3 postgresql-8.3.23.tar.gz -2fa850ea2e83e390efceedb60eaf6537 postgresql-8.4.18.tar.gz -a1a5c6e975e269cff3dac144b9c3ad0e postgresql-9.0.14.tar.gz -0bc70c103de99b8f12e9086eb96c44c8 postgresql-9.1.10.tar.gz -48854ef39a96a22a3aff964817594a28 postgresql-9.2.5.tar.gz -58edfab25d6bb243ff2c8bf2d2df34d3 postgresql-9.3.1.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 Sat Oct 26 17:49:44 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 26 Oct 2013 15:49:44 +0000 Subject: SF.net SVN: gar:[22314] csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile Message-ID: Revision: 22314 http://gar.svn.sourceforge.net/gar/?rev=22314&view=rev Author: guengel Date: 2013-10-26 15:49:44 +0000 (Sat, 26 Oct 2013) Log Message: ----------- pg-ip4r/branches/ip4r-1.05: Set MERGE_DIRS_$(MODULATION) properly for 64bit ISA. Modified Paths: -------------- csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile 2013-10-26 14:27:56 UTC (rev 22313) +++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile 2013-10-26 15:49:44 UTC (rev 22314) @@ -49,8 +49,9 @@ CONFIGURE_ARGS_83 = --with-docdir=$(docdir)/postgresql/$(PGVERSION) MERGE_SCRIPTS_$(MODULATION) = copy-relocate +# Only set MERGE_DIRS_$(MODULATION) if it is a 64bit ISA +MERGE_DIRS_$(MODULATION) = $(if $(subst $(ISA_DEFAULT64),,$(ISA)),,$(libdir)) - PACKAGES = $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r) $(foreach v,$(MODULATIONS_PGVERSION),\ $(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\ 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 Oct 26 17:50:51 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 26 Oct 2013 15:50:51 +0000 Subject: SF.net SVN: gar:[22315] csw/mgar/pkg/pg-ip4r/trunk/Makefile Message-ID: Revision: 22315 http://gar.svn.sourceforge.net/gar/?rev=22315&view=rev Author: guengel Date: 2013-10-26 15:50:51 +0000 (Sat, 26 Oct 2013) Log Message: ----------- pg-ip4r/trunk: Set MERGE_DIRS_$(MODULATION) properly for 64bit ISA. Modified Paths: -------------- csw/mgar/pkg/pg-ip4r/trunk/Makefile Modified: csw/mgar/pkg/pg-ip4r/trunk/Makefile =================================================================== --- csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 15:49:44 UTC (rev 22314) +++ csw/mgar/pkg/pg-ip4r/trunk/Makefile 2013-10-26 15:50:51 UTC (rev 22315) @@ -80,6 +80,8 @@ CONFIGURE_ARGS_93 = --docdir=$(docdir)/postgresql/$(PGVERSION) MERGE_SCRIPTS_$(MODULATION) = copy-relocate +# Only set MERGE_DIRS_$(MODULATION) if it is a 64bit ISA +MERGE_DIRS_$(MODULATION) = $(if $(subst $(ISA_DEFAULT64),,$(ISA)),,$(libdir)) PACKAGES = $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r) 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 Oct 27 09:54:41 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 27 Oct 2013 08:54:41 +0000 Subject: SF.net SVN: gar:[22316] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 22316 http://gar.svn.sourceforge.net/gar/?rev=22316&view=rev Author: guengel Date: 2013-10-27 08:54:37 +0000 (Sun, 27 Oct 2013) Log Message: ----------- gtk2/trunk: Updated BUILD_DEPs. Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2013-10-26 15:50:51 UTC (rev 22315) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2013-10-27 08:54:37 UTC (rev 22316) @@ -220,7 +220,7 @@ BUILD_DEP_PKGS += CSWggettext BUILD_DEP_PKGS += CSWlibpixman-dev BUILD_DEP_PKGS += CSWlibpng-dev -BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWlibfreetype-dev # Needed to make a test work BUILD_DEP_PKGS += CSWgamin 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 Oct 27 12:23:43 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Oct 2013 11:23:43 +0000 Subject: SF.net SVN: gar:[22317] csw/mgar/pkg/git/trunk Message-ID: Revision: 22317 http://gar.svn.sourceforge.net/gar/?rev=22317&view=rev Author: bdwalton Date: 2013-10-27 11:23:42 +0000 (Sun, 27 Oct 2013) Log Message: ----------- git/trunk: Version bump from 1.8.3.4 to 1.8.4.1 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 2013-10-27 08:54:37 UTC (rev 22316) +++ csw/mgar/pkg/git/trunk/Makefile 2013-10-27 11:23:42 UTC (rev 22317) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.8.3.4 +VERSION = 1.8.4.1 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2013-10-27 08:54:37 UTC (rev 22316) +++ csw/mgar/pkg/git/trunk/checksums 2013-10-27 11:23:42 UTC (rev 22317) @@ -1 +1 @@ -80eec3201a5d012913d287b85adaee8e git-1.8.3.4.tar.gz +5d8c89ad312ca0b0e603259c9357e6b8 git-1.8.4.1.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 Oct 27 15:01:58 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 27 Oct 2013 14:01:58 +0000 Subject: SF.net SVN: gar:[22318] csw/mgar/pkg/cpan/DBD-Pg/trunk Message-ID: Revision: 22318 http://gar.svn.sourceforge.net/gar/?rev=22318&view=rev Author: guengel Date: 2013-10-27 14:01:57 +0000 (Sun, 27 Oct 2013) Log Message: ----------- cpan/DBD-Pg/trunk: Updated to 2.19.3. Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums csw/mgar/pkg/cpan/DBD-Pg/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/cpan/DBD-Pg/trunk/files/0001-Dont-return-value-in-dequote_bytea.patch Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2013-10-27 11:23:42 UTC (rev 22317) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile 2013-10-27 14:01:57 UTC (rev 22318) @@ -1,5 +1,5 @@ NAME = DBD-Pg -VERSION = 2.17.2 +VERSION = 2.19.3 CATEGORIES = cpan GARTYPE = v2 AUTHOR = TURNSTEP @@ -14,8 +14,6 @@ DISTFILES += changelog.CSW -PATCHFILES = 0001-Dont-return-value-in-dequote_bytea.patch - PACKAGES = CSWpm-dbd-pg SPKG_DESC_$(PACKAGES) = $(DESCRIPTION) Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums 2013-10-27 11:23:42 UTC (rev 22317) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/checksums 2013-10-27 14:01:57 UTC (rev 22318) @@ -1 +1 @@ -2cd63605a9420a63c780f627420a359a DBD-Pg-2.17.2.tar.gz +026ea19f89aee12051bce23d797e824b DBD-Pg-2.19.3.tar.gz Deleted: csw/mgar/pkg/cpan/DBD-Pg/trunk/files/0001-Dont-return-value-in-dequote_bytea.patch =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/files/0001-Dont-return-value-in-dequote_bytea.patch 2013-10-27 11:23:42 UTC (rev 22317) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/files/0001-Dont-return-value-in-dequote_bytea.patch 2013-10-27 14:01:57 UTC (rev 22318) @@ -1,29 +0,0 @@ -From 0242e1aa1d6f6a95a1b1addb750c35c526ee20fe Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 1 Dec 2010 12:27:55 +0100 -Subject: [PATCH] Dont return value in dequote_bytea - ---- - quote.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/quote.c b/quote.c -index 96ca12f..f8a7249 100644 ---- a/quote.c -+++ b/quote.c -@@ -529,9 +529,10 @@ void dequote_bytea(char *string, STRLEN *retlen, int estring) - return; - - if ('\\' == *string && 'x' == *(string+1)) -- return _dequote_bytea_hex(string, retlen, estring); -+ _dequote_bytea_hex(string, retlen, estring); - else -- return _dequote_bytea_escape(string, retlen, estring); -+ _dequote_bytea_escape(string, retlen, estring); -+ return; - } - - /* --- -1.7.3 - Modified: csw/mgar/pkg/cpan/DBD-Pg/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cpan/DBD-Pg/trunk/files/changelog.CSW 2013-10-27 11:23:42 UTC (rev 22317) +++ csw/mgar/pkg/cpan/DBD-Pg/trunk/files/changelog.CSW 2013-10-27 14:01:57 UTC (rev 22318) @@ -1,3 +1,10 @@ +DBD-Pg (2.19.3,REV=2013.10.27) + + * New upstream release 2.19.3. + + -- Rafael Ostertag Sun, 27 Oct 2013 14:53:16 +0100 + + DBD-Pg (2.17.2,REV=2012.08.22) * Linked against CSWlibpg5. 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 Oct 27 15:31:03 2013 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 27 Oct 2013 14:31:03 +0000 Subject: SF.net SVN: gar:[22319] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 22319 http://gar.svn.sourceforge.net/gar/?rev=22319&view=rev Author: guengel Date: 2013-10-27 14:31:03 +0000 (Sun, 27 Oct 2013) Log Message: ----------- pgadmin3/trunk: Updated to 1.18.1. Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2013-10-27 14:01:57 UTC (rev 22318) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2013-10-27 14:31:03 UTC (rev 22319) @@ -3,7 +3,7 @@ # $Id$ NAME = pgadmin3 -VERSION = 1.16.1 +VERSION = 1.18.1 GARTYPE = v2 LICENSE = LICENSE @@ -19,13 +19,13 @@ DISTFILES += changelog.CSW UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PATCHFILES += 0001-use-wxT.patch - RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgets RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibz1 BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2013-10-27 14:01:57 UTC (rev 22318) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2013-10-27 14:31:03 UTC (rev 22319) @@ -1 +1 @@ -f3bc59630f0dc9600d4ad125097ce2fa pgadmin3-1.16.1.tar.gz +7dde96680407c900af72d0839a377de4 pgadmin3-1.18.1.tar.gz Deleted: csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch 2013-10-27 14:01:57 UTC (rev 22318) +++ csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch 2013-10-27 14:31:03 UTC (rev 22319) @@ -1,286 +0,0 @@ ---- a/pgadmin/ogl/basic.cpp Thu Aug 2 16:29:06 2012 -+++ b/pgadmin/ogl/basic.cpp Wed Jun 19 17:56:00 2013 -@@ -1631,7 +1631,7 @@ - hex = wxString(_T("#")) + hex; - clause->AddAttributeValueString(_T("pen_colour"), hex); - } -- else if (penColour != _T("BLACK")) -+ else if (penColour != wxT("BLACK")) - clause->AddAttributeValueString(_T("pen_colour"), penColour); - } - -@@ -1645,7 +1645,7 @@ - hex = wxString(_T("#")) + hex; - clause->AddAttributeValueString(_T("brush_colour"), hex); - } -- else if (brushColour != _T("WHITE")) -+ else if (brushColour != wxT("WHITE")) - clause->AddAttributeValueString(_T("brush_colour"), brushColour); - - if (m_brush->GetStyle() != wxSOLID) -@@ -1735,8 +1735,8 @@ - while (node) - { - wxShapeRegion *region = (wxShapeRegion *)node->GetData(); -- wxSprintf(regionNameBuf, _T("region%d"), regionNo); -- wxSprintf(textNameBuf, _T("text%d"), regionNo); -+ wxSprintf(regionNameBuf, wxT("region%d"), regionNo); -+ wxSprintf(textNameBuf, wxT("text%d"), regionNo); - - // Original text and region attributes: - // region1 = (regionName regionText x y width height minWidth minHeight proportionX proportionY -@@ -1920,9 +1920,9 @@ - clause->GetAttributeValue(_T("rotation"), m_rotation); - - if (pen_string == wxEmptyString) -- pen_string = _T("BLACK"); -+ pen_string = wxT("BLACK"); - if (brush_string == wxEmptyString) -- brush_string = _T("WHITE"); -+ brush_string = wxT("WHITE"); - - if (pen_string.GetChar(0) == '#') - { -@@ -1988,8 +1988,8 @@ - - wxExpr *regionExpr; - wxExpr *textExpr = NULL; -- wxSprintf(regionNameBuf, _T("region%d"), regionNo); -- wxSprintf(textNameBuf, _T("text%d"), regionNo); -+ wxSprintf(regionNameBuf, wxT("region%d"), regionNo); -+ wxSprintf(textNameBuf, wxT("text%d"), regionNo); - - m_formatted = TRUE; // Assume text is formatted unless we prove otherwise - -@@ -2066,7 +2066,7 @@ - regionTextColour = colourExpr->StringValue(); - } - else -- regionTextColour = _T("BLACK"); -+ regionTextColour = wxT("BLACK"); - - if (penColourExpr) - penColour = penColourExpr->StringValue(); -@@ -2147,8 +2147,8 @@ - } - - regionNo ++; -- wxSprintf(regionNameBuf, _T("region%d"), regionNo); -- wxSprintf(textNameBuf, _T("text%d"), regionNo); -+ wxSprintf(regionNameBuf, wxT("region%d"), regionNo); -+ wxSprintf(textNameBuf, wxT("text%d"), regionNo); - } - - // Compatibility: check for no regions (old file). ---- a/pgadmin/ogl/composit.cpp Thu Aug 2 16:29:06 2012 -+++ b/pgadmin/ogl/composit.cpp Wed Jun 19 17:56:08 2013 -@@ -581,7 +581,7 @@ - while (node) - { - wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData(); -- wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo); -+ wxSprintf(m_constraintNameBuf, wxT("constraint%d"), constraintNo); - - // Each constraint is stored in the form - // (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList) -@@ -655,7 +655,7 @@ - - while (haveConstraints) - { -- wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo); -+ wxSprintf(m_constraintNameBuf, wxT("constraint%d"), constraintNo); - wxExpr *constraintExpr = NULL; - clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr); - if (!constraintExpr) ---- a/pgadmin/dd/ddmodel/ddDBReverseEnginering.cpp Thu Aug 2 16:29:00 2012 -+++ b/pgadmin/dd/ddDBReverseEnginering.cpp Wed Jun 19 20:37:26 2013 -@@ -1535,7 +1535,7 @@ - // - - ddDBReverseEngineering::ddDBReverseEngineering(wxFrame *frame, ddDatabaseDesign *design, pgConn *connection, bool useSizer) -- : wxWizard(frame, wxID_ANY, _T("Import tables from schema wizard"), -+ : wxWizard(frame, wxID_ANY, wxT("Import tables from schema wizard"), - wxBitmap(*namespaces_png_bmp), wxDefaultPosition, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) - { -@@ -1547,17 +1547,17 @@ - initialPage = new wxWizardPageSimple(this); - - frontText = new wxStaticText(initialPage, wxID_ANY, -- _T("Import database tables to model tables wizard.\n") -- _T("\n") -- _T("The next pages will allow you to import database tables inside a database model.") -- _T("\n\n") -- _T("\nSome restrictions apply:\n\n") -- _T("1. Columns that belong to more than one unique constraint aren't supported.\n\n") -- _T("2. Relationships are imported only if both tables (source and destination) are imported.\n\n") -- _T("3. User defined datatypes aren't supported.\n\n") -- _T("4. No indexes, views, sequences and others objects different from tables/relationships can be imported.\n\n") -- _T("5. Tables with same name cannot be imported.\n\n") -- _T("6. Inherited tables cannot be imported.\n\n") -+ wxT("Import database tables to model tables wizard.\n") -+ wxT("\n") -+ wxT("The next pages will allow you to import database tables inside a database model.") -+ wxT("\n\n") -+ wxT("\nSome restrictions apply:\n\n") -+ wxT("1. Columns that belong to more than one unique constraint aren't supported.\n\n") -+ wxT("2. Relationships are imported only if both tables (source and destination) are imported.\n\n") -+ wxT("3. User defined datatypes aren't supported.\n\n") -+ wxT("4. No indexes, views, sequences and others objects different from tables/relationships can be imported.\n\n") -+ wxT("5. Tables with same name cannot be imported.\n\n") -+ wxT("6. Inherited tables cannot be imported.\n\n") - , wxPoint(5, 5) - ); - ---- a/pgadmin/dd/ddmodel/ddGenerationWizard.cpp Thu Aug 2 16:29:00 2012 -+++ b/pgadmin/dd/ddmodel/ddGenerationWizard.cpp Wed Jun 19 20:37:31 2013 -@@ -52,7 +52,7 @@ - END_EVENT_TABLE() - - ddGenerationWizard::ddGenerationWizard(wxFrame *frame, ddDatabaseDesign *design, pgConn *connection, bool useSizer) -- : wxWizard(frame, wxID_ANY, _T("Generate DDL from model"), -+ : wxWizard(frame, wxID_ANY, wxT("Generate DDL from model"), - wxBitmap(*continue_png_bmp), wxDefaultPosition, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) - { -@@ -63,16 +63,16 @@ - initialPage = new wxWizardPageSimple(this); - - frontText = new wxStaticText(initialPage, wxID_ANY, -- _T("Build DDL from model tables.\n") -- _T("\n") -- _T("The next pages will allow the built of DDL of the current database designer model.") -- _T("\n\n") -- _T("Restrictions apply when using experimental function ALTER TABLE instead of DROP/CREATE:\n\n") -- _T("1. Database connection is required to check differences with existing tables.\n\n") -- _T("2. Only changes done in the design will be applied to the db, not otherwise.\n\n") -- _T("3. Rename of columns or tables is not (yet) supported.\n\n") -- _T("4. Rename of constraints generate a drop and create, except for primary key constraints.\n\n") -- _T("5. All constraints should have a defined name.\n\n") -+ wxT("Build DDL from model tables.\n") -+ wxT("\n") -+ wxT("The next pages will allow the built of DDL of the current database designer model.") -+ wxT("\n\n") -+ wxT("Restrictions apply when using experimental function ALTER TABLE instead of DROP/CREATE:\n\n") -+ wxT("1. Database connection is required to check differences with existing tables.\n\n") -+ wxT("2. Only changes done in the design will be applied to the db, not otherwise.\n\n") -+ wxT("3. Rename of columns or tables is not (yet) supported.\n\n") -+ wxT("4. Rename of constraints generate a drop and create, except for primary key constraints.\n\n") -+ wxT("5. All constraints should have a defined name.\n\n") - , wxPoint(5, 5) - ); - ---- a/pgadmin/ogl/drawn.cpp Thu Aug 2 16:29:06 2012 -+++ b/pgadmin/ogl/drawn.cpp Wed Jun 19 17:56:15 2013 -@@ -1279,8 +1279,8 @@ - #if 0 - static char hexArray[] = - { -- _T('0'), _T('1'), _T('2'), _T('3'), _T('4'), _T('5'), _T('6'), _T('7'), -- _T('8'), _T('9'), _T('A'), _T('B'), _T('C'), _T('D'), _T('E'), _T('F') -+ wxT('0'), wxT('1'), wxT('2'), wxT('3'), wxT('4'), wxT('5'), wxT('6'), wxT('7'), -+ wxT('8'), wxT('9'), wxT('A'), wxT('B'), wxT('C'), wxT('D'), wxT('E'), wxT('F') - }; - - // Convert unsigned 16-bit integer to 4-character hex string -@@ -1305,37 +1305,37 @@ - { - switch (hex) - { -- case _T('0'): -+ case wxT('0'): - return 0; -- case _T('1'): -+ case wxT('1'): - return 1; -- case _T('2'): -+ case wxT('2'): - return 2; -- case _T('3'): -+ case wxT('3'): - return 3; -- case _T('4'): -+ case wxT('4'): - return 4; -- case _T('5'): -+ case wxT('5'): - return 5; -- case _T('6'): -+ case wxT('6'): - return 6; -- case _T('7'): -+ case wxT('7'): - return 7; -- case _T('8'): -+ case wxT('8'): - return 8; -- case _T('9'): -+ case wxT('9'): - return 9; -- case _T('A'): -+ case wxT('A'): - return 10; -- case _T('B'): -+ case wxT('B'): - return 11; -- case _T('C'): -+ case wxT('C'): - return 12; -- case _T('D'): -+ case wxT('D'): - return 13; -- case _T('E'): -+ case wxT('E'): - return 14; -- case _T('F'): -+ case wxT('F'): - return 15; - #if 0 - // handling this default outside switch removes warning under Borland -@@ -1482,7 +1482,7 @@ - wxNode *node = m_gdiObjects.GetFirst(); - while (node) - { -- wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i); -+ wxSprintf(buf, wxT("gdi%d_%d"), whichAngle, i); - wxObject *obj = (wxObject *)node->GetData(); - wxExpr *expr = NULL; - if (obj) -@@ -1540,7 +1540,7 @@ - node = m_ops.GetFirst(); - while (node) - { -- wxSprintf(buf, _T("op%d_%d"), whichAngle, i); -+ wxSprintf(buf, wxT("op%d_%d"), whichAngle, i); - wxDrawOp *op = (wxDrawOp *)node->GetData(); - wxExpr *expr = op->WriteExpr(this); - if (expr) -@@ -1611,7 +1611,7 @@ - bool keepGoing = TRUE; - while (keepGoing) - { -- wxSprintf(buf, _T("gdi%d_%d"), whichAngle, i); -+ wxSprintf(buf, wxT("gdi%d_%d"), whichAngle, i); - wxExpr *expr = NULL; - clause->GetAttributeValue(buf, &expr); - if (!expr) -@@ -1677,7 +1677,7 @@ - i = 1; - while (keepGoing) - { -- wxSprintf(buf, _T("op%d_%d"), whichAngle, i); -+ wxSprintf(buf, wxT("op%d_%d"), whichAngle, i); - wxExpr *expr = NULL; - clause->GetAttributeValue(buf, &expr); - if (!expr) ---- a/pgadmin/ogl/ogldiag.cpp Thu Aug 2 16:29:06 2012 -+++ b/pgadmin/ogl/ogldiag.cpp Wed Jun 19 17:56:19 2013 -@@ -281,7 +281,7 @@ - { - wxBeginBusyCursor(); - -- wxExprDatabase database(wxExprInteger, _T("id")); -+ wxExprDatabase database(wxExprInteger, wxT("id")); - if (!database.Read(filename)) - { - wxEndBusyCursor(); 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 Oct 27 16:28:31 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Oct 2013 15:28:31 +0000 Subject: SF.net SVN: gar:[22320] csw/mgar/pkg/git/trunk/files/ 0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch Message-ID: Revision: 22320 http://gar.svn.sourceforge.net/gar/?rev=22320&view=rev Author: bdwalton Date: 2013-10-27 15:28:31 +0000 (Sun, 27 Oct 2013) Log Message: ----------- git/trunk: update an existing patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch Modified: csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-10-27 14:31:03 UTC (rev 22319) +++ csw/mgar/pkg/git/trunk/files/0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch 2013-10-27 15:28:31 UTC (rev 22320) @@ -1,6 +1,6 @@ -From b1ceadb4298a86763b059ac5c9136f4a7e9bb6f2 Mon Sep 17 00:00:00 2001 +From 667867e20bbc4cdc0d0946e62cb4b8a9eca82134 Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Sun, 28 Jul 2013 14:09:19 +0200 +Date: Sun, 27 Oct 2013 13:30:26 +0100 Subject: [PATCH] Avoid difference in tr semantics between System V and BSD Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V @@ -25,13 +25,13 @@ broken_c_unquote. Replace the other two identical transforms with a fuction named broken_c_unquote_verbose. -Signed-off-by: Ben Walton +Signed-off-by: Ben Walton --- t/t0008-ignores.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh -index 9c1bde1..e455eb4 100755 +index c29342d..b176057 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -37,6 +37,14 @@ test_stderr () { @@ -49,7 +49,7 @@ stderr_contains () { regexp="$1" if grep "$regexp" "$HOME/stderr" -@@ -517,12 +525,11 @@ cat <<-EOF >expected-verbose +@@ -552,12 +560,11 @@ cat <<-EOF >expected-verbose $global_excludes:2:!globaltwo b/globaltwo EOF @@ -67,9 +67,9 @@ test_expect_success '--stdin' ' expect_from_stdin expected-verbose - $global_excludes:2:!globaltwo ../b/globaltwo - EOF +@@ -638,12 +645,11 @@ EOF + grep -v '^:: ' expected-all >expected-verbose + sed -e 's/.* //' expected-verbose >expected-default -sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ - tr "\n" "\0" >stdin0 @@ -86,5 +86,5 @@ test_expect_success '--stdin from subdirectory' ' expect_from_stdin Revision: 22321 http://gar.svn.sourceforge.net/gar/?rev=22321&view=rev Author: slowfranklin Date: 2013-10-27 15:38:23 +0000 (Sun, 27 Oct 2013) Log Message: ----------- netatalk/trunk: Update to 3.0.6 and enable Kerberos UAM Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-27 15:28:31 UTC (rev 22320) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-27 15:38:23 UTC (rev 22321) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.0.5 +VERSION = 3.0.6 GARTYPE = v2 DESCRIPTION = Open Source AFP fileserver @@ -36,6 +36,7 @@ RUNTIME_DEP_PKGS += CSWlibiconv2 RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 +RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2 # Don't know yet why but this dependency is only picked under sparc RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 @@ -54,6 +55,9 @@ PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf +# workaround for missing include in 3.0.6 +# EXTRA_CFLAG = -I/usr/include/kerberosv5/ + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk @@ -61,6 +65,7 @@ CONFIGURE_ARGS += --disable-tcp-wrappers CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48 CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk +CONFIGURE_ARGS += --enable-krbV-uam # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2013-10-27 15:28:31 UTC (rev 22320) +++ csw/mgar/pkg/netatalk/trunk/checksums 2013-10-27 15:38:23 UTC (rev 22321) @@ -1 +1 @@ -aa9393f1cf30bea9db0fec3b36bbdb83 netatalk-3.0.5.tar.gz +551c7a5ec57c4d8623c3079097905217 netatalk-3.0.6.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 Oct 27 19:14:13 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 27 Oct 2013 18:14:13 +0000 Subject: SF.net SVN: gar:[22322] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 22322 http://gar.svn.sourceforge.net/gar/?rev=22322&view=rev Author: chninkel Date: 2013-10-27 18:14:13 +0000 (Sun, 27 Oct 2013) Log Message: ----------- openssl1/trunk: enable use of solaris issetugid function Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 15:38:23 UTC (rev 22321) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 18:14:13 UTC (rev 22322) @@ -112,6 +112,12 @@ # crazy during library migration PATCHFILES += 0007-enables-symbols-versioning.patch +# openssl currently only uses issetugid on freebsd and openbsd +# althought it is also available on Solaris 10 +# We make issetugid support configurable via preprocessor flag +# to be able to enable it for Solaris +PATCHFILES += make_issetugid_support_configurable.patch + # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine ifneq ($(shell /usr/bin/uname -r),5.9) # There is a problem with this patch under sparc when using tls protocol @@ -176,12 +182,16 @@ sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc-sunw sparcv9_OS_COMPILER = solaris64-sparcv9-cc-sunw +# Solaris has the issetugid function since libc version interface SUNW_1.21 +# but openssl doesn't use it by default so we manually enable it +CONFIGURE_FLAGS = -DHAVE_ISSETUGID + # --libdir must only be given if the directory is actually different from lib or the creation will fail # as the directory is already there LIBDIR_64 = --libdir=lib/64 LIBDIR = $(LIBDIR_$(MEMORYMODEL)) -CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) $(LIBDIR) +CONFIGURE_ARGS = --prefix=$(prefix) shared $(CONFIGURE_FLAGS) $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) $(LIBDIR) # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages ifneq ($(shell /usr/bin/uname -r),5.9) Added: csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch (rev 0) +++ csw/mgar/pkg/openssl1/trunk/files/make_issetugid_support_configurable.patch 2013-10-27 18:14:13 UTC (rev 22322) @@ -0,0 +1,11 @@ +--- a/crypto/uid.c 2013-02-11 16:02:48.000000000 +0100 ++++ b/crypto/uid.c 2013-10-26 17:43:36.481546990 +0200 +@@ -56,7 +56,7 @@ + #include + #include + +-#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) ++#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(HAVE_ISSETUGID) + + #include OPENSSL_UNISTD + 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 Oct 27 21:29:27 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 27 Oct 2013 20:29:27 +0000 Subject: SF.net SVN: gar:[22323] csw/mgar/pkg/git/trunk Message-ID: Revision: 22323 http://gar.svn.sourceforge.net/gar/?rev=22323&view=rev Author: bdwalton Date: 2013-10-27 20:29:25 +0000 (Sun, 27 Oct 2013) Log Message: ----------- git/trunk: Add a patch to fix a non-portable sed usage in a test. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-10-27 18:14:13 UTC (rev 22322) +++ csw/mgar/pkg/git/trunk/Makefile 2013-10-27 20:29:25 UTC (rev 22323) @@ -118,6 +118,7 @@ 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-Avoid-difference-in-tr-semantics-between-System-V-an.patch +PATCHFILES += 0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch 2013-10-27 20:29:25 UTC (rev 22323) @@ -0,0 +1,42 @@ +From f38f944c3e393c7a316bbe17f2d507f7bd422275 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 27 Oct 2013 17:41:19 +0100 +Subject: [PATCH] Change sed invocation to something Solaris sed can handle + +Solaris' sed expects a newline after the i\ command and fails +with a 'garbled command' message if it's not there. Modify two uses +of sed in t4015-diff-whitespace that worked in GNU sed but not in +Solaris'. + +Signed-off-by: Ben Walton +--- + t/t4015-diff-whitespace.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh +index 3fb4b97..0126154 100755 +--- a/t/t4015-diff-whitespace.sh ++++ b/t/t4015-diff-whitespace.sh +@@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect + test_expect_success 'ignore-blank-lines: only new lines' ' + test_seq 5 >x && + git update-index x && +- test_seq 5 | sed "/3/i \\ ++ test_seq 5 | sed "/3/i\\ ++\ + " >x && + git diff --ignore-blank-lines >out && + >expect && +@@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' ' + test_expect_success 'ignore-blank-lines: only new lines with space' ' + test_seq 5 >x && + git update-index x && +- test_seq 5 | sed "/3/i \ " >x && ++ test_seq 5 | sed "/3/i\\ ++ " >x && + git diff -w --ignore-blank-lines >out && + >expect && + test_cmp out expect +-- +1.8.3.4 + 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 Oct 27 21:37:56 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 27 Oct 2013 20:37:56 +0000 Subject: SF.net SVN: gar:[22324] csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Message-ID: Revision: 22324 http://gar.svn.sourceforge.net/gar/?rev=22324&view=rev Author: chninkel Date: 2013-10-27 20:37:56 +0000 (Sun, 27 Oct 2013) Log Message: ----------- openssl1/trunk: changelog update Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-27 20:29:25 UTC (rev 22323) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-27 20:37:56 UTC (rev 22324) @@ -1,3 +1,10 @@ +openssl (1.0.1e,rev=2013.10.27) unstable + + * Enabled use of solaris native issetugid function in crypto/uid.c + thanks to Joerg Schilling. + + -- yann rouillard Sun, 27 Oct 2013 20:01:23 +0100 + openssl (1.0.1e,rev=2013.08.10) unstable * Re-enabled the i386 isa and disabled sse2 support for it to allow 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 Oct 27 21:40:51 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 27 Oct 2013 20:40:51 +0000 Subject: SF.net SVN: gar:[22325] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 22325 http://gar.svn.sourceforge.net/gar/?rev=22325&view=rev Author: chninkel Date: 2013-10-27 20:40:51 +0000 (Sun, 27 Oct 2013) Log Message: ----------- openssl1/trunk: enable sse2 usage based on runtime selection Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 20:37:56 UTC (rev 22324) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 20:40:51 UTC (rev 22325) @@ -146,10 +146,6 @@ BUILD64 = 1 ISAEXEC = 1 -# We re-enable the i386 default ISA to be able -# to provide an isa not requiring sse2 for old servers -ISA_DEFAULT_i386 = i386 - # The list of instructions set for which we will # provide optimized libraries and binaries EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 @@ -173,7 +169,7 @@ # The corresponding os/compiler to pass to the # openssl Configure script -i386_OS_COMPILER = no-sse2 solaris-x86-cc-sunw +i386_OS_COMPILER = solaris-x86-cc-sunw pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw amd64_OS_COMPILER = solaris64-x86_64-cc-sunw @@ -225,6 +221,17 @@ include gar/category.mk +# We remove SSE2 hardware capability in the elf header of libcrypto as +# openssl is able to select it at runtime and the Solaris OS support SSE2 since +# Solaris 9 4/04 (according to "Sun Studio 12: C++ User's Guide") +post-install: + if [[ "$(uname -p)" = "i386" ]]; then \ + echo " ==> Removing the SSE2 hardware capability from libcrypto"; \ + chmod +w "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ + elfedit -e 'cap:hw1 -and -cmp sse2' "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ + fi + @$(MAKECOOKIE) + pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-27 20:37:56 UTC (rev 22324) +++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW 2013-10-27 20:40:51 UTC (rev 22325) @@ -2,6 +2,7 @@ * Enabled use of solaris native issetugid function in crypto/uid.c thanks to Joerg Schilling. + * Enable sse2 usage based on runtime selection. -- yann rouillard Sun, 27 Oct 2013 20:01:23 +0100 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 Oct 27 22:17:53 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 27 Oct 2013 21:17:53 +0000 Subject: SF.net SVN: gar:[22326] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22326 http://gar.svn.sourceforge.net/gar/?rev=22326&view=rev Author: chninkel Date: 2013-10-27 21:17:53 +0000 (Sun, 27 Oct 2013) Log Message: ----------- openssl1/trunk: re-disable sse2 support for 386 build for the Solaris 9 target which doesn't have elfedit Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 20:40:51 UTC (rev 22325) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 21:17:53 UTC (rev 22326) @@ -169,7 +169,7 @@ # The corresponding os/compiler to pass to the # openssl Configure script -i386_OS_COMPILER = solaris-x86-cc-sunw +i386_OS_COMPILER = no-sse2 solaris-x86-cc-sunw pentium_pro_OS_COMPILER = solaris-x86-pentium_pro-cc-sunw amd64_OS_COMPILER = solaris64-x86_64-cc-sunw @@ -225,7 +225,7 @@ # openssl is able to select it at runtime and the Solaris OS support SSE2 since # Solaris 9 4/04 (according to "Sun Studio 12: C++ User's Guide") post-install: - if [[ "$(uname -p)" = "i386" ]]; then \ + if command -v elfedit >/dev/null 2>&1 && [[ "$(uname -p)" = "i386" ]]; then \ echo " ==> Removing the SSE2 hardware capability from libcrypto"; \ chmod +w "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ elfedit -e 'cap:hw1 -and -cmp sse2' "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 28 14:23:16 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 28 Oct 2013 13:23:16 +0000 Subject: SF.net SVN: gar:[22327] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22327 http://gar.svn.sourceforge.net/gar/?rev=22327&view=rev Author: chninkel Date: 2013-10-28 13:23:16 +0000 (Mon, 28 Oct 2013) Log Message: ----------- openssl1/trunk: fix i386 detection in SSE2 hardware capability removal code Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-27 21:17:53 UTC (rev 22326) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-28 13:23:16 UTC (rev 22327) @@ -225,7 +225,7 @@ # openssl is able to select it at runtime and the Solaris OS support SSE2 since # Solaris 9 4/04 (according to "Sun Studio 12: C++ User's Guide") post-install: - if command -v elfedit >/dev/null 2>&1 && [[ "$(uname -p)" = "i386" ]]; then \ + if command -v elfedit >/dev/null 2>&1 && [ "$(GARCH)" = "i386" ]; then \ echo " ==> Removing the SSE2 hardware capability from libcrypto"; \ chmod +w "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ elfedit -e 'cap:hw1 -and -cmp sse2' "$(DESTDIR)/$(libdir)/libcrypto.so.1.0.0"; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon Oct 28 18:59:02 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 28 Oct 2013 17:59:02 +0000 Subject: SF.net SVN: gar:[22328] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 22328 http://gar.svn.sourceforge.net/gar/?rev=22328&view=rev Author: slowfranklin Date: 2013-10-28 17:59:01 +0000 (Mon, 28 Oct 2013) Log Message: ----------- netatalk/trunk: Update to 3.1.0 Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-28 13:23:16 UTC (rev 22327) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-28 17:59:01 UTC (rev 22328) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.0.6 +VERSION = 3.1.0 GARTYPE = v2 DESCRIPTION = Open Source AFP fileserver @@ -15,6 +15,7 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWnetatalk.postinstall CSWnetatalk.preremove +GARCOMPILER = GNU PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -25,6 +26,7 @@ BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWlibdbus-dev BUILD_DEP_PKGS += CSWlibdbus-glib-dev +BUILD_DEP_PKGS += CSWlibtracker-dev RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS += CSWlibgcrypt11 @@ -37,6 +39,14 @@ RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibicuuc51 +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibtracker-common +RUNTIME_DEP_PKGS += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS += CSWlibtracker-miner0-16-0 # Don't know yet why but this dependency is only picked under sparc RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 @@ -55,9 +65,6 @@ PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf -# workaround for missing include in 3.0.6 -# EXTRA_CFLAG = -I/usr/include/kerberosv5/ - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk @@ -66,9 +73,17 @@ CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48 CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/run/netatalk CONFIGURE_ARGS += --enable-krbV-uam +CONFIGURE_ARGS += --with-tracker-prefix=/opt/csw +CONFIGURE_ARGS += --with-tracker-pkgconfig-version=0.16 # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml +CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used +CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used +CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libthread.so.1|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used +CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libtracker-data.so.0|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used +CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libintl.so.8|is|needed|by|/opt/csw/sbin/afpd|but|never|used +CHECKPKG_OVERRIDES_CSWnetatalk += surplus-dependency|CSWlibldap2-4-2 include gar/category.mk Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2013-10-28 13:23:16 UTC (rev 22327) +++ csw/mgar/pkg/netatalk/trunk/checksums 2013-10-28 17:59:01 UTC (rev 22328) @@ -1 +1 @@ -551c7a5ec57c4d8623c3079097905217 netatalk-3.0.6.tar.gz +f3d5b17e4916fd4670439175ea99cc39 netatalk-3.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Mon Oct 28 21:44:20 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 28 Oct 2013 20:44:20 +0000 Subject: SF.net SVN: gar:[22329] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: Revision: 22329 http://gar.svn.sourceforge.net/gar/?rev=22329&view=rev Author: slowfranklin Date: 2013-10-28 20:44:19 +0000 (Mon, 28 Oct 2013) Log Message: ----------- netatalk/trunk: Fix deps, remove overrides, disable MySQL CNID backend Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-28 17:59:01 UTC (rev 22328) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-28 20:44:19 UTC (rev 22329) @@ -15,7 +15,6 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWnetatalk.postinstall CSWnetatalk.preremove -GARCOMPILER = GNU PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -39,14 +38,9 @@ RUNTIME_DEP_PKGS += CSWlibldap2-4-2 RUNTIME_DEP_PKGS += CSWbdb48 RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWlibintl8 -RUNTIME_DEP_PKGS += CSWlibicuuc51 -RUNTIME_DEP_PKGS += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS += CSWlibgcc-s1 -RUNTIME_DEP_PKGS += CSWlibtracker-common RUNTIME_DEP_PKGS += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS += CSWlibtracker-miner0-16-0 +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 # Don't know yet why but this dependency is only picked under sparc RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 @@ -75,15 +69,11 @@ CONFIGURE_ARGS += --enable-krbV-uam CONFIGURE_ARGS += --with-tracker-prefix=/opt/csw CONFIGURE_ARGS += --with-tracker-pkgconfig-version=0.16 +# disable until asprintf() compat func is available in 3.1.1 +CONFIGURE_ARGS += --with-mysql-config=no # Path to XML dtd CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswnetatalk.xml -CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libicuuc.so.51|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used -CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libintl.so.8|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used -CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libthread.so.1|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used -CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libtracker-data.so.0|is|needed|by|/opt/csw/lib/netatalk/slmod_sparql.so|but|never|used -CHECKPKG_OVERRIDES_CSWnetatalk += soname-unused|libintl.so.8|is|needed|by|/opt/csw/sbin/afpd|but|never|used -CHECKPKG_OVERRIDES_CSWnetatalk += surplus-dependency|CSWlibldap2-4-2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Oct 28 23:53:55 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 28 Oct 2013 22:53:55 +0000 Subject: SF.net SVN: gar:[22330] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 22330 http://gar.svn.sourceforge.net/gar/?rev=22330&view=rev Author: chninkel Date: 2013-10-28 22:53:55 +0000 (Mon, 28 Oct 2013) Log Message: ----------- openssl1/trunk: add link to the upstream bug for issetugid Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-28 20:44:19 UTC (rev 22329) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2013-10-28 22:53:55 UTC (rev 22330) @@ -116,6 +116,7 @@ # althought it is also available on Solaris 10 # We make issetugid support configurable via preprocessor flag # to be able to enable it for Solaris +# Bug opened upstream: http://rt.openssl.org/Ticket/Display.html?id=3153 PATCHFILES += make_issetugid_support_configurable.patch # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine 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 Oct 29 08:09:37 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Oct 2013 07:09:37 +0000 Subject: SF.net SVN: gar:[22331] csw/mgar/pkg/diffstat/trunk Message-ID: Revision: 22331 http://gar.svn.sourceforge.net/gar/?rev=22331&view=rev Author: dmichelsen Date: 2013-10-29 07:09:37 +0000 (Tue, 29 Oct 2013) Log Message: ----------- diffstat/trunk: Update to 1.58 Modified Paths: -------------- csw/mgar/pkg/diffstat/trunk/Makefile csw/mgar/pkg/diffstat/trunk/checksums Modified: csw/mgar/pkg/diffstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffstat/trunk/Makefile 2013-10-28 22:53:55 UTC (rev 22330) +++ csw/mgar/pkg/diffstat/trunk/Makefile 2013-10-29 07:09:37 UTC (rev 22331) @@ -1,5 +1,5 @@ NAME = diffstat -VERSION = 1.57 +VERSION = 1.58 GARTYPE = v2 DESCRIPTION = A utility which provides statistics based on the output of diff Modified: csw/mgar/pkg/diffstat/trunk/checksums =================================================================== --- csw/mgar/pkg/diffstat/trunk/checksums 2013-10-28 22:53:55 UTC (rev 22330) +++ csw/mgar/pkg/diffstat/trunk/checksums 2013-10-29 07:09:37 UTC (rev 22331) @@ -1 +1 @@ -a70ae35e479ab91da7eb6023a4e9240a diffstat-1.57.tgz +6d6e13f7dcfe4db5da65c5175260ea47 diffstat-1.58.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 Oct 29 13:37:21 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 29 Oct 2013 12:37:21 +0000 Subject: SF.net SVN: gar:[22332] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 22332 http://gar.svn.sourceforge.net/gar/?rev=22332&view=rev Author: dmichelsen Date: 2013-10-29 12:37:21 +0000 (Tue, 29 Oct 2013) Log Message: ----------- gdk-pixbuf/trunk: Enable X11 library, update build deps Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2013-10-29 07:09:37 UTC (rev 22331) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2013-10-29 12:37:21 UTC (rev 22332) @@ -58,23 +58,23 @@ 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 += CSWlibglib2-0-0 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 -# CSWgdkpixbuf is supposed to pull in all deps. -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev = missing-dependency|CSWlibgdk-pixbuf2-0-0 +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 += CSWlibjbig-dev 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 += CSWlibtiff-dev BUILD64 = 1 @@ -88,6 +88,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix CONFIGURE_ARGS += --with-libintl-prefix +CONFIGURE_ARGS += --with-x11 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Wed Oct 30 11:52:22 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 30 Oct 2013 10:52:22 +0000 Subject: SF.net SVN: gar:[22333] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 22333 http://gar.svn.sourceforge.net/gar/?rev=22333&view=rev Author: slowfranklin Date: 2013-10-30 10:52:22 +0000 (Wed, 30 Oct 2013) Log Message: ----------- netatalk/trunk: Fix link error on SPARC Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/netatalk/trunk/files/0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-29 12:37:21 UTC (rev 22332) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-10-30 10:52:22 UTC (rev 22333) @@ -42,6 +42,8 @@ RUNTIME_DEP_PKGS += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +PATCHFILES += 0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch + # Don't know yet why but this dependency is only picked under sparc RUNTIME_DEP_PKGS_sparc = CSWlibgpg-error0 RUNTIME_DEP_PKGS += $(RUNTIME_DEP_PKGS_$(GARCH)) Added: csw/mgar/pkg/netatalk/trunk/files/0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch (rev 0) +++ csw/mgar/pkg/netatalk/trunk/files/0003-Disable-noinst-binary-fails-to-link-on-SPARC.patch 2013-10-30 10:52:22 UTC (rev 22333) @@ -0,0 +1,25 @@ +From 06753f73ca93e6a475c6dc9826d102139f36dc50 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 30 Oct 2013 11:37:56 +0100 +Subject: [PATCH] Disable noinst binary, fails to link on SPARC + +--- + etc/spotlight/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/spotlight/Makefile.in b/etc/spotlight/Makefile.in +index c9c696e..2c42393 100644 +--- a/etc/spotlight/Makefile.in ++++ b/etc/spotlight/Makefile.in +@@ -144,7 +144,7 @@ slmod_sparql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(LDFLAGS) -o $@ + @HAVE_TRACKER_SPARQL_TRUE at am_slmod_sparql_la_rpath = -rpath \ + @HAVE_TRACKER_SPARQL_TRUE@ $(moduledir) +- at HAVE_TRACKER_SPARQL_TRUE@am__EXEEXT_1 = srp$(EXEEXT) ++ at HAVE_TRACKER_SPARQL_TRUE@am__EXEEXT_1 = + PROGRAMS = $(noinst_PROGRAMS) + am__srp_SOURCES_DIST = slmod_sparql_map.c slmod_sparql_parser.y \ + spotlight_rawquery_lexer.l +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Oct 30 22:45:25 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 30 Oct 2013 21:45:25 +0000 Subject: SF.net SVN: gar:[22334] csw/mgar/pkg/svr4pkg/trunk/Makefile Message-ID: Revision: 22334 http://gar.svn.sourceforge.net/gar/?rev=22334&view=rev Author: chninkel Date: 2013-10-30 21:45:21 +0000 (Wed, 30 Oct 2013) Log Message: ----------- svr4pkg/trunk: added missing links to native tools name (installf, removef) Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 10:52:22 UTC (rev 22333) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 21:45:21 UTC (rev 22334) @@ -30,7 +30,7 @@ include gar/category.mk -NATIVE_TOOLS = pkgadd pkgrm pkginfo pkgchk pkgparam +NATIVE_TOOLS = pkgadd pkgrm pkginfo pkgchk pkgparam installf removef install-custom: @echo " ==> Installing $(NAME)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Oct 30 22:46:06 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 30 Oct 2013 21:46:06 +0000 Subject: SF.net SVN: gar:[22335] csw/mgar/pkg/svr4pkg/trunk Message-ID: Revision: 22335 http://gar.svn.sourceforge.net/gar/?rev=22335&view=rev Author: chninkel Date: 2013-10-30 21:46:06 +0000 (Wed, 30 Oct 2013) Log Message: ----------- svr4pkg/trunk: updated to last trunk Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile csw/mgar/pkg/svr4pkg/trunk/checksums Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 21:45:21 UTC (rev 22334) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 21:46:06 UTC (rev 22335) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = svr4pkg -VERSION = 0.1 +VERSION = 0.2 GARTYPE = v2 DESCRIPTION = Basic perl implementation of solaris native svr4 packages tools @@ -12,7 +12,7 @@ GITHUB_USER = yannrouillard MASTER_SITES = $(GITHUB_MIRROR) -DISTNAME = $(GITHUB_USER)-$(NAME)-35370d6 +DISTNAME = $(GITHUB_USER)-$(NAME)-79588fe DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) # We disable inclusion of CSWcommon by default as Modified: csw/mgar/pkg/svr4pkg/trunk/checksums =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/checksums 2013-10-30 21:45:21 UTC (rev 22334) +++ csw/mgar/pkg/svr4pkg/trunk/checksums 2013-10-30 21:46:06 UTC (rev 22335) @@ -1 +1 @@ -672a9ec401a079fb50c0fcf7869e5d75 svr4pkg-0.1.tar.gz +cc2202c59f5832cec21703b1d19d3890 svr4pkg-0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Oct 31 00:15:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 30 Oct 2013 23:15:33 +0000 Subject: SF.net SVN: gar:[22336] csw/mgar/pkg/svr4pkg/trunk Message-ID: Revision: 22336 http://gar.svn.sourceforge.net/gar/?rev=22336&view=rev Author: chninkel Date: 2013-10-30 23:15:33 +0000 (Wed, 30 Oct 2013) Log Message: ----------- svr4pkg/trunk: added standard class action scripts Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/svr4pkg/trunk/files/i.awk.sh csw/mgar/pkg/svr4pkg/trunk/files/i.build.sh csw/mgar/pkg/svr4pkg/trunk/files/i.preserve.sh csw/mgar/pkg/svr4pkg/trunk/files/i.sed.sh csw/mgar/pkg/svr4pkg/trunk/files/r.awk.sh csw/mgar/pkg/svr4pkg/trunk/files/r.build.sh csw/mgar/pkg/svr4pkg/trunk/files/r.sed.sh Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 21:46:06 UTC (rev 22335) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 23:15:33 UTC (rev 22336) @@ -32,6 +32,8 @@ NATIVE_TOOLS = pkgadd pkgrm pkginfo pkgchk pkgparam installf removef +CAS_LOCATION = /var/sadm/install/scripts + install-custom: @echo " ==> Installing $(NAME)" ginstall -d $(DESTDIR)$(bindir) @@ -39,7 +41,12 @@ cd "$(DESTDIR)$(bindir)" && for TOOL in $(NATIVE_TOOLS); do \ gln -sf svr4pkg "$$TOOL"; \ done + ginstall -d $(DESTDIR)$(CAS_LOCATION) + cd "$(FILEDIR)" && for CAS in *.sh; do \ + ginstall $$CAS $(DESTDIR)$(CAS_LOCATION)/$${CAS#.sh}; \ + done ginstall -d $(DESTDIR)$(docdir)$(NAME) ginstall $(WORKSRC)/README.md $(DESTDIR)$(docdir)$(NAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/svr4pkg/trunk/files/i.awk.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/i.awk.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/i.awk.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,70 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read src dest +do + [ "$src" = /dev/null ] && continue + + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/awk${client_dest} + else + savepath=$PKGSAV/awk${dest} + fi + + dirname=`dirname $savepath` + if [ $? -ne 0 ] + then + error=yes + continue + fi + if [ ! -d $dirname ] + then + # ignore return code since mkdir has bug + mkdir -p $dirname + fi + + cp $src $savepath && + /usr/sadm/install/scripts/cmdexec /usr/bin/awk install $savepath $dest + + if [ $? -ne 0 ] + then + error=yes + continue + fi +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/i.build.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/i.build.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/i.build.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,81 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read src dest +do + [ "$src" = /dev/null ] && continue + + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/build${client_dest} + else + savepath=$PKGSAV/build${dest} + fi + + dirname=`dirname $savepath` + if [ $? -ne 0 ] + then + error=yes + continue + fi + + if [ ! -d $dirname ] + then + # ignore return since mkdir has bug + mkdir -p $dirname + fi + + cp $src $savepath && + chmod 500 $savepath + if [ $? -ne 0 ] + then + error=yes + continue + fi + + if $savepath install > /tmp/$$build + then + if [ -s /tmp/$$build ] + then + cp /tmp/$$build $dest || error=yes + fi + else + error=yes + fi + rm -f /tmp/$$build +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/i.preserve.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/i.preserve.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/i.preserve.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,46 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 1998 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + + +error=no +echo "## checking common configuration files" +while read src dest +do + [ "$src" = /dev/null ] && continue + + if [ -f "$dest" ] + then + echo $dest preserved + else + echo $dest + cp $src $dest || error=yes + fi + +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/i.sed.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/i.sed.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/i.sed.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,70 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read src dest +do + [ "$src" = /dev/null ] && continue + + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/sed${client_dest} + else + savepath=$PKGSAV/sed${dest} + fi + + dirname=`dirname $savepath` + if [ $? -ne 0 ] + then + error=yes + continue + fi + + if [ ! -d $dirname ] + then + # ignore return since mkdir has bug + mkdir -p $dirname + fi + + cp $src $savepath && + /usr/sadm/install/scripts/cmdexec /bin/sed install $savepath $dest + + if [ $? -ne 0 ] + then + error=yes + fi +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/r.awk.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/r.awk.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/r.awk.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read dest +do + if [ -d $dest ] + then + echo "$dest" + rmdir $dest || error=yes + elif [ -f $dest ] + then + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/awk${client_dest} + else + savepath=$PKGSAV/awk${dest} + fi + + /usr/sadm/install/scripts/cmdexec /usr/bin/awk remove $savepath $dest || + error=yes + else + [ -r $dest ] && echo "$dest" + rm -f $dest || error=yes + fi +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/r.build.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/r.build.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/r.build.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,71 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read dest +do + if [ -d $dest ] + then + echo "$dest" + rmdir $dest || error=yes + elif [ -f $dest ] + then + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/build${client_dest} + else + savepath=$PKGSAV/build${dest} + fi + + chmod +x $savepath + if $savepath remove > /tmp/$$build + then + if [ ! -s /tmp/$$build ] + then + rm -f $dest + else + cp /tmp/$$build $dest || error=yes + fi + else + error=yes + fi + rm -f /tmp/$$build + else + [ -r $dest ] && echo "$dest" + rm -f $dest || error=yes + fi +done +[ "$error" = yes ] && + exit 2 +exit 0 Added: csw/mgar/pkg/svr4pkg/trunk/files/r.sed.sh =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/files/r.sed.sh (rev 0) +++ csw/mgar/pkg/svr4pkg/trunk/files/r.sed.sh 2013-10-30 23:15:33 UTC (rev 22336) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# + +error=no +while read dest +do + if [ -d $dest ] + then + echo "$dest" + rmdir $dest || error=yes + elif [ -f $dest ] + then + echo "Modifying $dest" + + # Strip PKG_INSTALL_ROOT from dest if installation is to an + # alternate root. + + if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + client_dest=`echo $dest | \ + /usr/bin/nawk -v rootdir="$PKG_INSTALL_ROOT" '{ + { print substr($0, length(rootdir)+1)} }'` + savepath=$PKGSAV/sed${client_dest} + else + savepath=$PKGSAV/sed${dest} + fi + + /usr/sadm/install/scripts/cmdexec /bin/sed remove $savepath $dest || + error=yes + else + [ -r $dest ] && echo "$dest" + rm -f $dest || error=yes + fi +done +[ "$error" = yes ] && + exit 2 +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Oct 31 00:36:04 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 30 Oct 2013 23:36:04 +0000 Subject: SF.net SVN: gar:[22337] csw/mgar/pkg/svr4pkg/trunk/Makefile Message-ID: Revision: 22337 http://gar.svn.sourceforge.net/gar/?rev=22337&view=rev Author: chninkel Date: 2013-10-30 23:36:02 +0000 (Wed, 30 Oct 2013) Log Message: ----------- svr4pkg/trunk: fix bashism in class action script installation instructions Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 23:15:33 UTC (rev 22336) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 23:36:02 UTC (rev 22337) @@ -21,6 +21,11 @@ # We disable the checkpkg alarms related CHECKPKG_OVERRIDES_CSWsvr4pkg += missing-dependency| +# We provide some default class action script +# located in a place not standard so we disable +# the checkpkg warning +CHECKPKG_OVERRIDES_CSWsvr4pkg += bad-location-of-file| + ARCHALL = 1 CONFIGURE_SCRIPTS = @@ -43,7 +48,7 @@ done ginstall -d $(DESTDIR)$(CAS_LOCATION) cd "$(FILEDIR)" && for CAS in *.sh; do \ - ginstall $$CAS $(DESTDIR)$(CAS_LOCATION)/$${CAS#.sh}; \ + ginstall $$CAS $(DESTDIR)$(CAS_LOCATION)/`echo ${CAS} | sed -e '/\.sh$$//'`; \ done ginstall -d $(DESTDIR)$(docdir)$(NAME) ginstall $(WORKSRC)/README.md $(DESTDIR)$(docdir)$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Oct 31 00:54:13 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 30 Oct 2013 23:54:13 +0000 Subject: SF.net SVN: gar:[22338] csw/mgar/pkg/svr4pkg/trunk Message-ID: Revision: 22338 http://gar.svn.sourceforge.net/gar/?rev=22338&view=rev Author: chninkel Date: 2013-10-30 23:54:13 +0000 (Wed, 30 Oct 2013) Log Message: ----------- svr4pkg/trunk: updated to last version Modified Paths: -------------- csw/mgar/pkg/svr4pkg/trunk/Makefile csw/mgar/pkg/svr4pkg/trunk/checksums Modified: csw/mgar/pkg/svr4pkg/trunk/Makefile =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 23:36:02 UTC (rev 22337) +++ csw/mgar/pkg/svr4pkg/trunk/Makefile 2013-10-30 23:54:13 UTC (rev 22338) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = svr4pkg -VERSION = 0.2 +VERSION = 0.3 GARTYPE = v2 DESCRIPTION = Basic perl implementation of solaris native svr4 packages tools @@ -12,7 +12,7 @@ GITHUB_USER = yannrouillard MASTER_SITES = $(GITHUB_MIRROR) -DISTNAME = $(GITHUB_USER)-$(NAME)-79588fe +DISTNAME = $(GITHUB_USER)-$(NAME)-dab9dcf DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) # We disable inclusion of CSWcommon by default as Modified: csw/mgar/pkg/svr4pkg/trunk/checksums =================================================================== --- csw/mgar/pkg/svr4pkg/trunk/checksums 2013-10-30 23:36:02 UTC (rev 22337) +++ csw/mgar/pkg/svr4pkg/trunk/checksums 2013-10-30 23:54:13 UTC (rev 22338) @@ -1 +1 @@ -cc2202c59f5832cec21703b1d19d3890 svr4pkg-0.2.tar.gz +17af960cff18d5bc0140c50c8f71b74a svr4pkg-0.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 31 10:43:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 09:43:06 +0000 Subject: SF.net SVN: gar:[22339] csw/mgar/pkg Message-ID: Revision: 22339 http://gar.svn.sourceforge.net/gar/?rev=22339&view=rev Author: dmichelsen Date: 2013-10-31 09:43:04 +0000 (Thu, 31 Oct 2013) Log Message: ----------- libdbx/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libdbx/ csw/mgar/pkg/libdbx/branches/ csw/mgar/pkg/libdbx/tags/ csw/mgar/pkg/libdbx/trunk/ csw/mgar/pkg/libdbx/trunk/Makefile csw/mgar/pkg/libdbx/trunk/checksums csw/mgar/pkg/libdbx/trunk/files/ Property changes on: csw/mgar/pkg/libdbx/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/libdbx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdbx/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libdbx/trunk/Makefile 2013-10-31 09:43:04 UTC (rev 22339) @@ -0,0 +1,16 @@ +# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +# +# ! This is pretty much unfinished +NAME = libdbx +VERSION = 1.0.4 + +DESCRIPTION = Outlook to unix mail converter library + +SF_PROJECT = ol2mbox +MASTER_SITES += $(SF_MIRROR) +DISTNAME = $(NAME)_$(VERSION) +DISTFILES += $(DISTNAME).tar.gz + +BUILD64 = 1 + +include gar/category.mk Property changes on: csw/mgar/pkg/libdbx/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libdbx/trunk/checksums =================================================================== --- csw/mgar/pkg/libdbx/trunk/checksums (rev 0) +++ csw/mgar/pkg/libdbx/trunk/checksums 2013-10-31 09:43:04 UTC (rev 22339) @@ -0,0 +1 @@ +65e1b1ad93560d9c487cbabb4a558a4e libdbx_1.0.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Oct 31 10:59:22 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 31 Oct 2013 09:59:22 +0000 Subject: SF.net SVN: gar:[22340] csw/mgar/pkg/mplayer/branches/snapshot Message-ID: Revision: 22340 http://gar.svn.sourceforge.net/gar/?rev=22340&view=rev Author: pfelecan Date: 2013-10-31 09:59:21 +0000 (Thu, 31 Oct 2013) Log Message: ----------- mplayer/branches/snapshot: weekly snapshot Modified Paths: -------------- csw/mgar/pkg/mplayer/branches/snapshot/Makefile csw/mgar/pkg/mplayer/branches/snapshot/checksums Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-31 09:43:04 UTC (rev 22339) +++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-31 09:59:21 UTC (rev 22340) @@ -165,7 +165,7 @@ CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1 # this exists only on i386 and Solaris 10 CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics -# this in incongruous (dur to man/cat1 usage): +# this in incongruous (due to man/cat1 usage): CHECKPKG_OVERRIDES_CSWmencoder += missing-dependency|CSWfltk PACKAGES += CSWmencoder Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums =================================================================== --- csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-31 09:43:04 UTC (rev 22339) +++ csw/mgar/pkg/mplayer/branches/snapshot/checksums 2013-10-31 09:59:21 UTC (rev 22340) @@ -1,2 +1,2 @@ -1974183d76b42a1d343ee211396834c5 ffmpeg-snapshot.tar.bz2 -1ccfd06282fd705a307e0907ee9c8063 mplayer-export-snapshot.tar.bz2 +7c5ad6d88e41f50883184b73e95a1eb7 ffmpeg-snapshot.tar.bz2 +58c809e55916fc29a4533eb3fad3b789 mplayer-export-snapshot.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 Oct 31 12:54:58 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 11:54:58 +0000 Subject: SF.net SVN: gar:[22341] csw/mgar/pkg Message-ID: Revision: 22341 http://gar.svn.sourceforge.net/gar/?rev=22341&view=rev Author: dmichelsen Date: 2013-10-31 11:54:58 +0000 (Thu, 31 Oct 2013) Log Message: ----------- Followup to r19588, SF_PROJECT instead of SF_PROJ Revision Links: -------------- http://gar.svn.sourceforge.net/gar/?rev=19588&view=rev Modified Paths: -------------- csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/libfaac/trunk/Makefile csw/mgar/pkg/libflac4/trunk/Makefile csw/mgar/pkg/libflac7/trunk/Makefile csw/mgar/pkg/libmatio/trunk/Makefile csw/mgar/pkg/libming/trunk/Makefile csw/mgar/pkg/liburiparser/trunk/Makefile csw/mgar/pkg/par2cmdline/trunk/Makefile csw/mgar/pkg/php4/trunk/Makefile csw/mgar/pkg/tcl84/trunk/Makefile csw/mgar/pkg/tex_metauml/trunk/Makefile csw/mgar/pkg/tex_metauml_lop/trunk/Makefile csw/mgar/pkg/tex_metauml_man/trunk/Makefile Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/flac/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -26,11 +26,11 @@ SF_PROJECT = flac MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)-$(VERSION) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(SF_PROJ)-$(VERSION).tar.gz) +DISTNAME = $(SF_PROJECT)-$(VERSION) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(SF_PROJECT)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES)) +NOEXTRACT = $(filter-out $(SF_PROJECT)-$(VERSION).tar.gz,$(SOURCEFILES)) PATCHFILES_isa-sparcv8-version-1.1.2 = libtool-64bit.patch PATCHFILES_isa-sparcv9-version-1.1.2 = libtool-64bit.patch Modified: csw/mgar/pkg/libfaac/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfaac/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/libfaac/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -9,8 +9,8 @@ SF_PROJECT = faac MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(SF_PROJ)-$(VERSION).tar.bz2 -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTFILES = $(SF_PROJECT)-$(VERSION).tar.bz2 +DISTNAME = $(SF_PROJECT)-$(VERSION) PACKAGES = CSWfaac CATALOGNAME = $(NAME) @@ -18,7 +18,7 @@ SPKG_SOURCEURL = http://www.audiocoding.com/ # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = $(SF_PROJECT)-(\d+(?:\.\d+)*).tar.bz2 #PATCHFILES += Makefile.am.diff Makefile.in.diff Makefile.in.frontend.diff PATCHFILES += Makefile.in.frontend.diff Makefile.in.common.mp4v2.diff Modified: csw/mgar/pkg/libflac4/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac4/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/libflac4/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -15,7 +15,7 @@ SF_PROJECT = flac MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz PATCHFILES = strip-nasm-1.0.4.patch Modified: csw/mgar/pkg/libflac7/trunk/Makefile =================================================================== --- csw/mgar/pkg/libflac7/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/libflac7/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -15,7 +15,7 @@ SF_PROJECT = flac MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz PATCHFILES += libtool-64bit.patch Modified: csw/mgar/pkg/libmatio/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmatio/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/libmatio/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -8,7 +8,7 @@ SF_PROJECT = matio MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz # We define upstream file regex so we can be notifed of new upstream software release Modified: csw/mgar/pkg/libming/trunk/Makefile =================================================================== --- csw/mgar/pkg/libming/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/libming/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -14,8 +14,8 @@ endef MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = ming -DISTNAME = $(SF_PROJ)-$(VERSION) +SF_PROJECT = ming +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES += 0001-PrintGifError-to-GifErrorString.patch PATCHFILES += 0002-makeswf-include-path.patch Modified: csw/mgar/pkg/liburiparser/trunk/Makefile =================================================================== --- csw/mgar/pkg/liburiparser/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/liburiparser/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -9,7 +9,7 @@ SF_PROJECT = uriparser MASTER_SITES = $(SF_MIRROR) -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 # File name regex to get notifications about upstream software releases Modified: csw/mgar/pkg/par2cmdline/trunk/Makefile =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/par2cmdline/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -11,7 +11,7 @@ endef MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = parchive +SF_PROJECT = parchive DISTFILES = $(DISTNAME).tar.gz PATCHFILES = 0001-Debian-0.4-11-serial-000_unidentified.patch PATCHFILES += 0002-Debian-0.4-11-serial-001_hardlinks.patch Modified: csw/mgar/pkg/php4/trunk/Makefile =================================================================== --- csw/mgar/pkg/php4/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/php4/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -2,7 +2,7 @@ VERSION = 4.4.9 GARTYPE = v2 SF_PROJECT = $(shell echo $(NAME) | sed -e 's/[0-9]//g') -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DESCRIPTION = A high-level scripting language. define BLURB Modified: csw/mgar/pkg/tcl84/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl84/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/tcl84/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -8,7 +8,7 @@ SF_PROJECT = tcl MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)$(VERSION) +DISTNAME = $(SF_PROJECT)$(VERSION) DISTFILES = $(DISTNAME)-src.tar.gz UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894 Modified: csw/mgar/pkg/tex_metauml/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_metauml/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/tex_metauml/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -11,7 +11,7 @@ DISTNAME = metauml_lib MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = metauml +SF_PROJECT = metauml DISTFILES = $(DISTNAME)_$(VERSION).tgz DISTFILES += README.CSW Modified: csw/mgar/pkg/tex_metauml_lop/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_metauml_lop/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/tex_metauml_lop/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -13,7 +13,7 @@ WORKSRC = $(WORKDIR) PATCHDIR = $(WORKSRC) MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = metauml +SF_PROJECT = metauml DISTFILES = lop-release.tgz DISTFILES += COPYING DISTFILES += README.CSW Modified: csw/mgar/pkg/tex_metauml_man/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_metauml_man/trunk/Makefile 2013-10-31 09:59:21 UTC (rev 22340) +++ csw/mgar/pkg/tex_metauml_man/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) @@ -14,7 +14,7 @@ WORKSRC = $(WORKDIR)/$(DISTNAME)2 PATCHDIR = $(WORKSRC) MASTER_SITES = $(SF_MIRRORS) -SF_PROJ = metauml +SF_PROJECT = metauml DISTFILES = $(DISTNAME)_src_$(VERSION).tgz DISTFILES += fdl-1.3.txt 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 Oct 31 14:46:10 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 13:46:10 +0000 Subject: SF.net SVN: gar:[22342] csw/mgar/pkg/gsasl/trunk Message-ID: Revision: 22342 http://gar.svn.sourceforge.net/gar/?rev=22342&view=rev Author: dmichelsen Date: 2013-10-31 13:46:10 +0000 (Thu, 31 Oct 2013) Log Message: ----------- gsasl/trunk: Update to 1.8.0 Modified Paths: -------------- csw/mgar/pkg/gsasl/trunk/Makefile csw/mgar/pkg/gsasl/trunk/checksums Modified: csw/mgar/pkg/gsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsasl/trunk/Makefile 2013-10-31 11:54:58 UTC (rev 22341) +++ csw/mgar/pkg/gsasl/trunk/Makefile 2013-10-31 13:46:10 UTC (rev 22342) @@ -1,5 +1,5 @@ NAME = gsasl -VERSION = 1.6.2 +VERSION = 1.8.0 GARTYPE = v2 DESCRIPTION = GNU SASL binary @@ -13,6 +13,7 @@ GNU_PROJECT = gsasl MASTER_SITES = $(GNU_MIRROR) MASTER_SITES += http://daily.josefsson.org/gsasl/ +MASTER_SITES += ftp://alpha.gnu.org/gnu/gsasl/ DISTFILES = $(NAME)-$(VERSION).tar.gz VENDOR_URL = http://www.gnu.org/software/$(GNU_PROJ) @@ -27,12 +28,9 @@ RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibntlm0 RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibk5crypto3 OBSOLETED_BY_CSWlibgsasl7 += CSWlibgsasl PACKAGES += CSWlibgsasl-dev @@ -48,28 +46,20 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgsasl7 RUNTIME_DEP_PKGS_CSWgsasl += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWgsasl += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibntlm0 RUNTIME_DEP_PKGS_CSWgsasl += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWgsasl += CSWlibgnutls28 -# We don't need it and if defined the test breaks -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - # Disable 64 bit until krb5 is available in 64 bit BUILD64_LIBS_ONLY = 1 +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-gssapi-impl=mit + EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias +# The testsuite runs fine, but finishes with exit code 1, ?!? +SKIPTEST ?= 1 + include gar/category.mk -# Tests use 'grep -e' -PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gsasl/trunk/checksums =================================================================== --- csw/mgar/pkg/gsasl/trunk/checksums 2013-10-31 11:54:58 UTC (rev 22341) +++ csw/mgar/pkg/gsasl/trunk/checksums 2013-10-31 13:46:10 UTC (rev 22342) @@ -1 +1 @@ -b37d9268e734094281e928cd64f6fab9 gsasl-1.6.2.tar.gz +982fe54a20016aa46a871c084c990c36 gsasl-1.8.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 Thu Oct 31 14:56:30 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 13:56:30 +0000 Subject: SF.net SVN: gar:[22343] csw/mgar/pkg Message-ID: Revision: 22343 http://gar.svn.sourceforge.net/gar/?rev=22343&view=rev Author: dmichelsen Date: 2013-10-31 13:56:30 +0000 (Thu, 31 Oct 2013) Log Message: ----------- xmlsec/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/xmlsec/ csw/mgar/pkg/xmlsec/Makefile csw/mgar/pkg/xmlsec/branches/ csw/mgar/pkg/xmlsec/tags/ csw/mgar/pkg/xmlsec/trunk/ csw/mgar/pkg/xmlsec/trunk/Makefile csw/mgar/pkg/xmlsec/trunk/checksums csw/mgar/pkg/xmlsec/trunk/files/ Added: csw/mgar/pkg/xmlsec/Makefile =================================================================== --- csw/mgar/pkg/xmlsec/Makefile (rev 0) +++ csw/mgar/pkg/xmlsec/Makefile 2013-10-31 13:56:30 UTC (rev 22343) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/xmlsec/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/xmlsec/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlsec/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xmlsec/trunk/Makefile 2013-10-31 13:56:30 UTC (rev 22343) @@ -0,0 +1,78 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = xmlsec1 +VERSION = 1.2.19 +GARTYPE = v2 + +DESCRIPTION = XML Security Library + +MASTER_SITES = http://www.aleksey.com/xmlsec/download/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.aleksey.com/xmlsec/ + +PACKAGES += CSWxmlsec1 +SPKG_DESC_CSWxmlsec1 = XML Security +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWxmlsec1 += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWxmlsec1 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWxmlsec1 += CSWlibxmlsec1-1 + +PACKAGES += CSWlibxmlsec1-dev +SPKG_DESC_CSWlibxmlsec1-dev = Development files for libxmlsec1.so.1 +PKGFILES_CSWlibxmlsec1-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibxmlsec1-dev += $(docdir)/xmlsec1/.* +PKGFILES_CSWlibxmlsec1-dev += $(call baseisadirs,$(libdir),xmlsec1Conf.sh) +RUNTIME_DEP_PKGS_CSWlibxmlsec1-dev += CSWlibxmlsec1-1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-dev += CSWlibxmlsec1gcrypt1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-dev += CSWlibxmlsec1gnutls1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-dev += CSWlibxmlsec1nss1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-dev += CSWlibxmlsec1openssl1 + +PACKAGES += CSWlibxmlsec1-1 +SPKG_DESC_CSWlibxmlsec1-1 = XML security library +PKGFILES_CSWlibxmlsec1-1 += $(call pkgfiles_lib,libxmlsec1.so.1) +RUNTIME_DEP_PKGS_CSWlibxmlsec1-1 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-1 += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1-1 += CSWlibxml2-2 + +PACKAGES += CSWlibxmlsec1gcrypt1 +SPKG_DESC_CSWlibxmlsec1gcrypt1 = XML security library for gcrypt +PKGFILES_CSWlibxmlsec1gcrypt1 += $(call pkgfiles_lib,libxmlsec1-gcrypt.so.1) +RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibxmlsec1-1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibxml2-2 + +PACKAGES += CSWlibxmlsec1gnutls1 +SPKG_DESC_CSWlibxmlsec1gnutls1 = XML security library for GNU TLS +PKGFILES_CSWlibxmlsec1gnutls1 += $(call pkgfiles_lib,libxmlsec1-gnutls.so.1) +RUNTIME_DEP_PKGS_CSWlibxmlsec1gnutls1 += CSWlibxmlsec1-1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gnutls1 += CSWlibxmlsec1gcrypt1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gnutls1 += CSWlibgnutls28 +RUNTIME_DEP_PKGS_CSWlibxmlsec1gnutls1 += CSWlibxml2-2 + +PACKAGES += CSWlibxmlsec1nss1 +SPKG_DESC_CSWlibxmlsec1nss1 = XML security library for NSS +PKGFILES_CSWlibxmlsec1nss1 += $(call pkgfiles_lib,libxmlsec1-nss.so.1) +RUNTIME_DEP_PKGS_CSWlibxmlsec1nss1 += CSWlibsmime3 +RUNTIME_DEP_PKGS_CSWlibxmlsec1nss1 += CSWlibxmlsec1-1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1nss1 += CSWlibnspr4 +RUNTIME_DEP_PKGS_CSWlibxmlsec1nss1 += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWlibxmlsec1nss1 += CSWlibxml2-2 + +PACKAGES += CSWlibxmlsec1openssl1 +SPKG_DESC_CSWlibxmlsec1openssl1 = XML security library for OpenSSL +PKGFILES_CSWlibxmlsec1openssl1 += $(call pkgfiles_lib,libxmlsec1-openssl.so.1) +RUNTIME_DEP_PKGS_CSWlibxmlsec1openssl1 += CSWlibxmlsec1-1 +RUNTIME_DEP_PKGS_CSWlibxmlsec1openssl1 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibxmlsec1openssl1 += CSWlibxml2-2 + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/xmlsec/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/xmlsec/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlsec/trunk/checksums (rev 0) +++ csw/mgar/pkg/xmlsec/trunk/checksums 2013-10-31 13:56:30 UTC (rev 22343) @@ -0,0 +1 @@ +fe664ba5f01ebfaeb0ab5deeb0b2249e xmlsec1-1.2.19.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 Oct 31 15:42:48 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 14:42:48 +0000 Subject: SF.net SVN: gar:[22344] csw/mgar/pkg/xmlsec/trunk/Makefile Message-ID: Revision: 22344 http://gar.svn.sourceforge.net/gar/?rev=22344&view=rev Author: dmichelsen Date: 2013-10-31 14:42:48 +0000 (Thu, 31 Oct 2013) Log Message: ----------- xmlsec/trunk: Add override Modified Paths: -------------- csw/mgar/pkg/xmlsec/trunk/Makefile Modified: csw/mgar/pkg/xmlsec/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlsec/trunk/Makefile 2013-10-31 13:56:30 UTC (rev 22343) +++ csw/mgar/pkg/xmlsec/trunk/Makefile 2013-10-31 14:42:48 UTC (rev 22344) @@ -45,6 +45,9 @@ RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWlibxmlsec1gcrypt1 += CSWlibxml2-2 +# This is on i386 only, some day I need to investigate this +CHECKPKG_OVERRIDES_CSWlibxmlsec1gcrypt1 += surplus-dependency|CSWlibgpg-error0 + PACKAGES += CSWlibxmlsec1gnutls1 SPKG_DESC_CSWlibxmlsec1gnutls1 = XML security library for GNU TLS PKGFILES_CSWlibxmlsec1gnutls1 += $(call pkgfiles_lib,libxmlsec1-gnutls.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 Thu Oct 31 15:53:54 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 14:53:54 +0000 Subject: SF.net SVN: gar:[22345] csw/mgar/pkg/gsasl/trunk/Makefile Message-ID: Revision: 22345 http://gar.svn.sourceforge.net/gar/?rev=22345&view=rev Author: dmichelsen Date: 2013-10-31 14:53:54 +0000 (Thu, 31 Oct 2013) Log Message: ----------- gsasl/trunk: Add override Modified Paths: -------------- csw/mgar/pkg/gsasl/trunk/Makefile Modified: csw/mgar/pkg/gsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsasl/trunk/Makefile 2013-10-31 14:42:48 UTC (rev 22344) +++ csw/mgar/pkg/gsasl/trunk/Makefile 2013-10-31 14:53:54 UTC (rev 22345) @@ -33,6 +33,9 @@ RUNTIME_DEP_PKGS_CSWlibgsasl7 += CSWlibidn11 OBSOLETED_BY_CSWlibgsasl7 += CSWlibgsasl +# Annoying, override for now +CHECKPKG_OVERRIDES_CSWlibgsasl7 += surplus-dependency|CSWlibgpg-error0 + PACKAGES += CSWlibgsasl-dev SPKG_DESC_CSWlibgsasl-dev = Development files for GNU SASL library libgsasl.so.7 PKGFILES_CSWlibgsasl-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 Thu Oct 31 15:54:18 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 14:54:18 +0000 Subject: SF.net SVN: gar:[22346] csw/mgar/pkg Message-ID: Revision: 22346 http://gar.svn.sourceforge.net/gar/?rev=22346&view=rev Author: dmichelsen Date: 2013-10-31 14:54:18 +0000 (Thu, 31 Oct 2013) Log Message: ----------- lasso/trunk: Initial commit, binding compilation fails Added Paths: ----------- csw/mgar/pkg/lasso/ csw/mgar/pkg/lasso/Makefile csw/mgar/pkg/lasso/branches/ csw/mgar/pkg/lasso/tags/ csw/mgar/pkg/lasso/trunk/ csw/mgar/pkg/lasso/trunk/Makefile csw/mgar/pkg/lasso/trunk/checksums csw/mgar/pkg/lasso/trunk/files/ Added: csw/mgar/pkg/lasso/Makefile =================================================================== --- csw/mgar/pkg/lasso/Makefile (rev 0) +++ csw/mgar/pkg/lasso/Makefile 2013-10-31 14:54:18 UTC (rev 22346) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lasso/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lasso/trunk/Makefile =================================================================== --- csw/mgar/pkg/lasso/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lasso/trunk/Makefile 2013-10-31 14:54:18 UTC (rev 22346) @@ -0,0 +1,20 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = lasso +VERSION = 2.3.6 +GARTYPE = v2 + +DESCRIPTION = Free Liberty Alliance Single Sign on + +MASTER_SITES = https://dev.entrouvert.org/lasso/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://lasso.entrouvert.org + +BUILD_DEP_PKGS += CSWlibxmlsec1-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/lasso/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lasso/trunk/checksums =================================================================== --- csw/mgar/pkg/lasso/trunk/checksums (rev 0) +++ csw/mgar/pkg/lasso/trunk/checksums 2013-10-31 14:54:18 UTC (rev 22346) @@ -0,0 +1 @@ +fa5c8c958b37f967fcc4eb0024dc7b5d lasso-2.3.6.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 Oct 31 16:02:54 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 31 Oct 2013 15:02:54 +0000 Subject: SF.net SVN: gar:[22347] csw/mgar/pkg/lang-python/python/trunk Message-ID: Revision: 22347 http://gar.svn.sourceforge.net/gar/?rev=22347&view=rev Author: wahwah Date: 2013-10-31 15:02:54 +0000 (Thu, 31 Oct 2013) Log Message: ----------- lang-python/python/trunk: Upgrade to 2.6.9 Modified Paths: -------------- csw/mgar/pkg/lang-python/python/trunk/Makefile csw/mgar/pkg/lang-python/python/trunk/checksums Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-10-31 14:54:18 UTC (rev 22346) +++ csw/mgar/pkg/lang-python/python/trunk/Makefile 2013-10-31 15:02:54 UTC (rev 22347) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.6.8 +VERSION = 2.6.9 VER = 2.6 DVER = 2-6 UVER = 2_6 @@ -36,7 +36,7 @@ PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz DISTFILES += pyport.h # Patches @@ -178,14 +178,10 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibtk8-5 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWlibtcl8-4 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.9 += CSWtk -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtcl8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_5.10 += CSWlibtk8-5 -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += $(RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk_$(GAROSREL)) - # Don't merge test files. EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python$(VER)/test/.* Modified: csw/mgar/pkg/lang-python/python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/trunk/checksums 2013-10-31 14:54:18 UTC (rev 22346) +++ csw/mgar/pkg/lang-python/python/trunk/checksums 2013-10-31 15:02:54 UTC (rev 22347) @@ -1 +1 @@ -c6e0420a21d8b23dee8b0195c9b9a125 Python-2.6.8.tar.bz2 +933a811f11e3db3d73ae492f6c3a7a76 Python-2.6.9.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 31 16:03:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 15:03:59 +0000 Subject: SF.net SVN: gar:[22348] csw/mgar/pkg/nss/trunk/Makefile Message-ID: Revision: 22348 http://gar.svn.sourceforge.net/gar/?rev=22348&view=rev Author: dmichelsen Date: 2013-10-31 15:03:59 +0000 (Thu, 31 Oct 2013) Log Message: ----------- nss/trunk: Fix for #5119 Modified Paths: -------------- csw/mgar/pkg/nss/trunk/Makefile Modified: csw/mgar/pkg/nss/trunk/Makefile =================================================================== --- csw/mgar/pkg/nss/trunk/Makefile 2013-10-31 15:02:54 UTC (rev 22347) +++ csw/mgar/pkg/nss/trunk/Makefile 2013-10-31 15:03:59 UTC (rev 22348) @@ -341,6 +341,6 @@ ginstall -m 644 $(FILEDIR)/nss.pc \ $(DESTDIR)$(libdir)/pkgconfig if [ $(MEMORYMODEL) = 64 ]; then \ - gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nss.pc ; \ + gsed -i -e 's+/lib$$+/lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nss.pc ; \ fi @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Oct 31 16:58:01 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 31 Oct 2013 15:58:01 +0000 Subject: SF.net SVN: gar:[22349] csw/mgar/pkg Message-ID: Revision: 22349 http://gar.svn.sourceforge.net/gar/?rev=22349&view=rev Author: dmichelsen Date: 2013-10-31 15:58:01 +0000 (Thu, 31 Oct 2013) Log Message: ----------- pspp/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/pspp/ csw/mgar/pkg/pspp/Makefile csw/mgar/pkg/pspp/branches/ csw/mgar/pkg/pspp/tags/ csw/mgar/pkg/pspp/trunk/ csw/mgar/pkg/pspp/trunk/Makefile csw/mgar/pkg/pspp/trunk/checksums csw/mgar/pkg/pspp/trunk/files/ csw/mgar/pkg/pspp/trunk/files/0001-Do-not-use-Wall-unless-gcc.patch Added: csw/mgar/pkg/pspp/Makefile =================================================================== --- csw/mgar/pkg/pspp/Makefile (rev 0) +++ csw/mgar/pkg/pspp/Makefile 2013-10-31 15:58:01 UTC (rev 22349) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pspp/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pspp/trunk/Makefile =================================================================== --- csw/mgar/pkg/pspp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pspp/trunk/Makefile 2013-10-31 15:58:01 UTC (rev 22349) @@ -0,0 +1,63 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pspp +VERSION = 0.8.1 +GARTYPE = v2 + +DESCRIPTION = GNU program for statistical analysis of sampled data + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Do-not-use-Wall-unless-gcc.patch + +PACKAGES += CSWpspp +SPKG_DESC_CSWpspp = GNU program for statistical analysis of sampled data +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgsl0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWpspp += CSWgtksourceview +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpspp += CSWpango +RUNTIME_DEP_PKGS_CSWpspp += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpspp += CSWlibpq5 + +GARCOMPILER = GNU + +# Do not use 64 bit until this is fixed: +# https://www.opencsw.org/mantis/view.php?id=5120 +#BUILD64 = 1 +#ISAEXEC = 1 + +# Use GNU tools +BUILD_OVERRIDE_VARS += XGETTEXT +BUILD_OVERRIDE_VARS += MSGMERGE +BUILD_OVERRIDE_VARS += MSGFMT + +BUILD_OVERRIDE_VAR_XGETTEXT = gxgettext +BUILD_OVERRIDE_VAR_MSGMERGE = gxmsgmerge +BUILD_OVERRIDE_VAR_MSGFMT = gmsgfmt + +CONFIGURE_ARGS += $(DIRPATHS) + +# There is a problem with C99 headers and GCC +CONFIGURE_ARGS += --without-perl-module + +# There are some tests failing, investigate later +SKIPTEST ?= 1 + +EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias + +include gar/category.mk + Property changes on: csw/mgar/pkg/pspp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pspp/trunk/checksums =================================================================== --- csw/mgar/pkg/pspp/trunk/checksums (rev 0) +++ csw/mgar/pkg/pspp/trunk/checksums 2013-10-31 15:58:01 UTC (rev 22349) @@ -0,0 +1 @@ +c6d7a7389e76538410d12047672d28ee pspp-0.8.1.tar.gz Added: csw/mgar/pkg/pspp/trunk/files/0001-Do-not-use-Wall-unless-gcc.patch =================================================================== --- csw/mgar/pkg/pspp/trunk/files/0001-Do-not-use-Wall-unless-gcc.patch (rev 0) +++ csw/mgar/pkg/pspp/trunk/files/0001-Do-not-use-Wall-unless-gcc.patch 2013-10-31 15:58:01 UTC (rev 22349) @@ -0,0 +1,39 @@ +From 5eba57875fa506df9954769795572c5b34bfd5c9 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 30 Oct 2013 15:24:20 +0100 +Subject: [PATCH] =?UTF-8?q?Do=20not=20use=20-Wall=C3=82=20unless=20gcc?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index fbe7f92..1b139ca 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2825,7 +2825,7 @@ lib_tukey_libtukey_la_SOURCES = \ + lib/tukey/qtukey.c \ + lib/tukey/tukey.h + +- at HAVE_GUI_TRUE@lib_gtk_contrib_libxpaned_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 ++ at HAVE_GUI_TRUE@lib_gtk_contrib_libxpaned_a_CFLAGS = $(GTK_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 + @HAVE_GUI_TRUE at lib_gtk_contrib_libxpaned_a_SOURCES = \ + @HAVE_GUI_TRUE@ lib/gtk-contrib/gtkxpaned.c \ + @HAVE_GUI_TRUE@ lib/gtk-contrib/gtkxpaned.h +@@ -3458,8 +3458,8 @@ UI_FILES = \ + src/ui/gui/var-sheet.ui \ + src/ui/gui/var-type-dialog.ui + +- at HAVE_GUI_TRUE@src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 +- at HAVE_GUI_TRUE@src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1 ++ at HAVE_GUI_TRUE@src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 ++ at HAVE_GUI_TRUE@src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -DGDK_MULTIHEAD_SAFE=1 + @HAVE_GUI_TRUE at src_ui_gui_psppire_LDFLAGS = $(PSPPIRE_LDFLAGS) \ + @HAVE_GUI_TRUE@ $(PG_LDFLAGS) $(am__append_9) $(am__append_10) + @HAVE_GUI_TRUE at src_ui_gui_psppire_LDADD = \ +-- +1.8.3.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.