From lblume at users.sourceforge.net Sat Jun 1 10:47:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 01 Jun 2013 08:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21235] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21235 http://gar.svn.sourceforge.net/gar/?rev=21235&view=rev Author: lblume Date: 2013-06-01 08:47:58 +0000 (Sat, 01 Jun 2013) Log Message: ----------- samba/branches/samba3: Enable CUPS for 64 bit; force -z ignore -z lazyload Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-05-31 13:43:02 UTC (rev 21234) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-01 08:47:58 UTC (rev 21235) @@ -24,12 +24,17 @@ # This is taken from the old Samba package DISTFILES += cswkrb5.conf +GARCOMPILER=SOS12U3 + #What needs to be fixed: # Split libs and packages BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWcups-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibreadline-dev PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -44,13 +49,14 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWsamba += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon @@ -71,25 +77,15 @@ RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba-client += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtdb1 OBSOLETED_BY_CSWsamba-client += CSWsambaclient CATALOGNAME_CSWsambaclient = samba_client_stub -#PACKAGES += CSWsambacommon -SPKG_DESC_CSWsambacommon = Shared support files for samba -RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl -RUNTIME_DEP_PKGS_CSWsambacommon += CSWreadline -RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibpopt -RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibnet -RUNTIME_DEP_PKGS_CSWsambacommon += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWsambacommon += CSWiconv -RUNTIME_DEP_PKGS_CSWsambacommon += CSWggettext - #PACKAGES += CSWsambadoc SPKG_DESC_CSWsambadoc = Samba documentation ARCHALL_CSWsambadoc = 1 @@ -112,19 +108,6 @@ OBSOLETED_BY_CSWlibsmbclient0 += CSWsambalib CATALOGNAME_CSWsambalib = samba_lib_stub -PACKAGES += CSWlibnetapi0 -PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) -SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 - -PACKAGES += CSWlibsmbsharemodes0 -PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) -SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0 - -PACKAGES += CSWlibtdb1 -PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) -SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 - PACKAGES += CSWlibwbclient0 PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0) SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0 @@ -134,15 +117,15 @@ SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1 PACKAGES += CSWlibsmbsharemodes0 PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) @@ -250,23 +233,23 @@ RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibz1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb CATALOGNAME_CSWsambawb = samba_wb_stub CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1 -EXTRA_CFLAGS = -lintl -EXTRA_LDFLAGS = -lintl +# Needed as the configure script doesn't add it +EXTRA_LINKER_FLAGS += -lintl -z ignore -z lazyload BUILD64 = 1 ISAEXEC = 1 @@ -280,8 +263,6 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes CONFIGURE_ARGS += --enable-static=no -#CONFIGURE_ARGS += --enable-socket-wrapper -#CONFIGURE_ARGS += --enable-nss-wrapper CONFIGURE_ARGS += --with-acl-support CONFIGURE_ARGS += --with-aio-support CONFIGURE_ARGS += --with-pam @@ -293,7 +274,7 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount CONFIGURE_ARGS += --with-dnsupdate=no -# Do not set krb5 this is handeled in gar. Otherwise 64bit will not build +# Do not set krb5 this is handled in gar. Otherwise 64bit will not build #CONFIGURE_ARGS += --with-krb5=$(prefix) CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) @@ -304,16 +285,12 @@ CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR) -CONFIGURE_ARGS-64 += --disable-cups -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) - # Can't use fdatasync atm do to linker problems +# Symbols are not in the right libc CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no - - BUILD_SCRIPTS = $(WORKSRC)/source3/Makefile TEST_SCRIPTS = $(WORKSRC)/source3/Makefile 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 Jun 1 11:05:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 01 Jun 2013 09:05:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21236] csw/mgar/gar/v2 Message-ID: Revision: 21236 http://gar.svn.sourceforge.net/gar/?rev=21236&view=rev Author: pfelecan Date: 2013-06-01 09:05:51 +0000 (Sat, 01 Jun 2013) Log Message: ----------- .buildsys/v2: add support for GitHub hosted repositories; for the documentation, see: https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference#DownloadSettings Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-06-01 08:47:58 UTC (rev 21235) +++ csw/mgar/gar/v2/gar.conf.mk 2013-06-01 09:05:51 UTC (rev 21236) @@ -760,6 +760,21 @@ SF_PROJECT_SHOWFILE ?= http://sourceforge.net/project/showfiles.php?group_id UPSTREAM_USE_SF ?= 0 +# Git Hub (only if GIHUB_USER variable is defined) +# see http://developer.github.com/v3/repos/contents/#get-archive-link +# and https://help.github.com/articles/downloading-files-from-the-command-line +GITHUB_HOST = api.github.com +ifdef GITHUB_USER +GITHUB_PROJECT ?= $(NAME) +GITHUB_BALL ?= tar +GITHUB_BRANCH ?= master +GITHUB_MIRROR ?= https://$(GITHUB_HOST)/repos/$(GITHUB_USER)/$(GITHUB_PROJECT)/$(GITHUB_BALL)ball/$(GITHUB_BRANCH) +GITHUB_BALL_EXT := .$(GITHUB_BALL) +ifeq ($(GITHUB_BALL),tar) +GITHUB_BALL_EXT := $(GITHUB_BALL_EXT).gz +endif +endif + # Google Code GOOGLE_PROJECT ?= $(NAME) GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-06-01 08:47:58 UTC (rev 21235) +++ csw/mgar/gar/v2/gar.lib.mk 2013-06-01 09:05:51 UTC (rev 21236) @@ -31,9 +31,9 @@ # add these 'dynamic script' targets to our fetch list DYNURLS := $(foreach DYN,$(DYNSCRIPTS),dynscr://$(DYN)) -$(foreach M,$(MASTER_SITES),$(if $(filter %/,$M),,$(error MASTER_SITES must contain only URLs ending in a / wheres this did not: $M))) +$(foreach M,$(MASTER_SITES),$(if $(findstring $(GITHUB_HOST),$(M)),,$(if $(filter %/,$M),,$(error MASTER_SITES must contain only URLs ending in a / wheres this did not: $M)))) -URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(DISTFILES))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(addprefix $(SITE),$(ALLFILES_PATCHFILES))) $(DYNURLS) +URLS := $(foreach SITE,$(FILE_SITES) $(MASTER_SITES),$(if $(findstring $(GITHUB_HOST),$(SITE)),$(SITE),$(addprefix $(SITE),$(DISTFILES)))) $(foreach SITE,$(FILE_SITES) $(PATCH_SITES) $(MASTER_SITES),$(if $(findstring $(GITHUB_HOST),$(SITE)),$(SITE),$(addprefix $(SITE),$(ALLFILES_PATCHFILES)))) $(DYNURLS) define gitsubst $(subst git-git,git,$(if $(findstring $(1)://,$(2)),$(patsubst $(1)%,git-$(1)%,$(call URLSTRIP,$(2))))) @@ -50,14 +50,18 @@ # 1) we have to strip the colon from the URLs # 2) the download is very costly with bigger Makefiles as they will be # re-evaluated for every URL (nested gmake invocation, room for improvement) -$(DOWNLOADDIR)/%: _FLIST=$(filter %/$*,$(URLS)) +$(DOWNLOADDIR)/%: _FLIST=$(filter %/$*,$(URLS)) $(foreach URL,$(URLS),$(if $(findstring $(GITHUB_HOST),$(URL)),$(URL),)) $(DOWNLOADDIR)/%: $(if $(_FLIST),,$(error INTERNAL ERROR: The file $* is requested but not in the list of generated URLs)) @if test -f $(COOKIEDIR)/checksum-$*; then : ; else \ echo " ==> Grabbing $@"; \ - ( for i in $(filter %/$*,$(URLS)); do \ + ( for i in $(filter %/$*,$(URLS)) $(foreach URL,$(URLS),$(if $(findstring $(GITHUB_HOST),$(URL)),$(URL),)); do \ echo " ==> Trying $$i"; \ $(MAKE) -s `echo $$i | tr -d :` || continue; \ + case $$i in \ + *$(GITHUB_HOST)*) \ + mv $(PARTIALDIR)/$(GITHUB_BRANCH) $(PARTIALDIR)/$(DISTNAME)$(GITHUB_BALL_EXT) ;; \ + esac; \ mv $(PARTIALDIR)/$* $@; \ break; \ done; ) 2>&1 | grep -v '^$(MAKE)'; \ 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 Jun 1 20:44:46 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 01 Jun 2013 18:44:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21237] csw/mgar/pkg/libsndfile/trunk/Makefile Message-ID: Revision: 21237 http://gar.svn.sourceforge.net/gar/?rev=21237&view=rev Author: lblume Date: 2013-06-01 18:44:46 +0000 (Sat, 01 Jun 2013) Log Message: ----------- libsndfile/trunk: Update recipe, remove broken test Modified Paths: -------------- csw/mgar/pkg/libsndfile/trunk/Makefile Modified: csw/mgar/pkg/libsndfile/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsndfile/trunk/Makefile 2013-06-01 09:05:51 UTC (rev 21236) +++ csw/mgar/pkg/libsndfile/trunk/Makefile 2013-06-01 18:44:46 UTC (rev 21237) @@ -37,7 +37,6 @@ PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch PATCHFILES += 0004-Add-branch-for-inttypes.h.patch # PATCHFILES += 0005-Test-for-unsigned-or-test-will-fail.patch - VENDOR_URL = http://www.mega-nerd.com/libsndfile/ BUILD_DEP_PKGS += CSWlibflac-dev @@ -48,12 +47,8 @@ PACKAGES += CSWlibsndfile-utils CATALOGNAME_CSWlibsndfile-utils = libsndfile_utils SPKG_DESC_CSWlibsndfile-utils = Tools for reading and writing files containing sampled sound -RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibflac8 RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibsndfile1 -RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibsndfile-utils += CSWlibvorbisenc2 OBSOLETED_BY_CSWlibsndfile-utils = CSWlibsndfile PACKAGES += CSWlibsndfile1 @@ -77,9 +72,11 @@ # Relocate docs to standard location EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),' -# These are all examples -CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/FAQ.html -CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/octave.html -CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/pkgconfig.html +# One of the tests is buggy and segfaults +SKIPTEST = 1 include gar/category.mk + +# Solaris sed will make test fail +PATH := /opt/csw/gnu:$(PATH) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Jun 2 16:04:23 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 02 Jun 2013 14:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21238] csw/mgar/pkg/puppet3/trunk/Makefile Message-ID: Revision: 21238 http://gar.svn.sourceforge.net/gar/?rev=21238&view=rev Author: phipsy Date: 2013-06-02 14:04:20 +0000 (Sun, 02 Jun 2013) Log Message: ----------- puppet3: mantis 5062; create dir Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-06-01 18:44:46 UTC (rev 21237) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-06-02 14:04:20 UTC (rev 21238) @@ -90,6 +90,7 @@ install-puppet: ginstall -m 755 -d $(DESTDIR) ginstall -m 755 -d $(DESTDIR)/etc/puppet + ginstall -m 755 -d $(DESTDIR)/var/lib/puppet ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/etc/puppet/README.CSW ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)/etc/puppet/puppet.conf.example-CSW ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet @@ -103,15 +104,7 @@ --bindir=$(bindir) \ --sbindir=$(sbindir) \ --full - ginstall -m 755 $(FILEDIR)/pkgutil.rb $(DESTDIR)$(rubysitelibdir)/puppet/provider/package cd $(DESTDIR)$(mandir)/man8 && gunzip * - # (cd $(WORKSRC)/examples/etc/puppet && \ - # for f in *; do \ - # if [ -f $$f ] ; then \ - # cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - # chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \ - # fi; \ - # done) mv $(DESTDIR)$(sysconfdir)/puppet/auth.conf $(DESTDIR)$(sysconfdir)/puppet/auth.conf.example ginstall -m 644 $(FILEDIR)/puppet.conf.example-CSW $(DESTDIR)$(sysconfdir)/puppet/puppet.conf.example ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/puppet 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 Jun 2 16:58:34 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 02 Jun 2013 14:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21239] csw/mgar/pkg/fluidsynth/trunk/Makefile Message-ID: Revision: 21239 http://gar.svn.sourceforge.net/gar/?rev=21239&view=rev Author: lblume Date: 2013-06-02 14:58:30 +0000 (Sun, 02 Jun 2013) Log Message: ----------- fluidsynth/trunk: Remove unused dependency Modified Paths: -------------- csw/mgar/pkg/fluidsynth/trunk/Makefile Modified: csw/mgar/pkg/fluidsynth/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-06-02 14:04:20 UTC (rev 21238) +++ csw/mgar/pkg/fluidsynth/trunk/Makefile 2013-06-02 14:58:30 UTC (rev 21239) @@ -36,9 +36,8 @@ SPKG_DESC_CSWfluidsynth-dev += $(DESCRIPTION), development files # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibsndfile +RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibsndfile1 RUNTIME_DEP_PKGS_CSWlibfluidsynth1 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWfluidsynth-dev += CSWlibfluidsynth1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sun Jun 2 17:06:09 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sun, 02 Jun 2013 15:06:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21240] csw/mgar/pkg/puppet3/trunk/Makefile Message-ID: Revision: 21240 http://gar.svn.sourceforge.net/gar/?rev=21240&view=rev Author: phipsy Date: 2013-06-02 15:06:09 +0000 (Sun, 02 Jun 2013) Log Message: ----------- puppet3: checkpkg fascism Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2013-06-02 14:58:30 UTC (rev 21239) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-06-02 15:06:09 UTC (rev 21240) @@ -80,11 +80,14 @@ CHECKPKG_OVERRIDES_CSWpuppet3 += bad-location-of-file|file=/etc/puppet CHECKPKG_OVERRIDES_CSWpuppet3 += bad-location-of-file|file=/etc/puppet/README.CSW CHECKPKG_OVERRIDES_CSWpuppet3 += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW +CHECKPKG_OVERRIDES_CSWpuppet3 += bad-location-of-file|file=/var/lib +CHECKPKG_OVERRIDES_CSWpuppet3 += bad-location-of-file|file=/var/lib/puppet # yes, yes, we know it conflicts with puppet{,.asmter} - that's the point of # INCOMPATIBLE_PKGS CHECKPKG_OVERRIDES_CSWpuppet3 += file-collision CHECKPKG_OVERRIDES_CSWpuppetmaster3 += file-collision + include gar/category.mk install-puppet: 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 Jun 3 09:55:32 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 03 Jun 2013 07:55:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21241] csw/mgar/pkg/libvorbis/trunk/Makefile Message-ID: Revision: 21241 http://gar.svn.sourceforge.net/gar/?rev=21241&view=rev Author: lblume Date: 2013-06-03 07:55:31 +0000 (Mon, 03 Jun 2013) Log Message: ----------- libvorbis/trunk: The dependency on libsunmath is not needed anymore on current S10 Modified Paths: -------------- csw/mgar/pkg/libvorbis/trunk/Makefile Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2013-06-02 15:06:09 UTC (rev 21240) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2013-06-03 07:55:31 UTC (rev 21241) @@ -19,7 +19,6 @@ SPKG_DESC_CSWlibvorbis0 = Vorbis codec library, libvorbis.so.0 PKGFILES_CSWlibvorbis0 += $(call baseisadirs,$(libdir),libvorbis\.so\.0(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibvorbis0 += CSWsunmath OBSOLETED_BY_CSWlibvorbis0 = CSWvorbis CATALOGNAME_CSWvorbis = libvorbis_stub @@ -27,9 +26,7 @@ CATALOGNAME_CSWlibvorbisenc2 = libvorbisenc2 SPKG_DESC_CSWlibvorbisenc2 = Vorbis codec library, libvorbisenc.so.2 PKGFILES_CSWlibvorbisenc2 += $(call baseisadirs,$(libdir),libvorbisenc\.so\.2(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibvorbisenc2 += CSWsunmath OBSOLETED_BY_CSWlibvorbisenc2 = CSWvorbis PACKAGES += CSWlibvorbisfile3 @@ -38,7 +35,6 @@ PKGFILES_CSWlibvorbisfile3 += $(call baseisadirs,$(libdir),libvorbisfile\.so\.3(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibvorbisfile3 += CSWsunmath OBSOLETED_BY_CSWlibvorbisfile3 = CSWvorbis PACKAGES += CSWlibvorbis-dev @@ -51,7 +47,7 @@ BUILD64_LIBS_ONLY = 1 -EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm +EXTRA_LD_FLAGS = -L$(libdir) -lm CONFIGURE_ARGS = $(DIRPATHS) 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 Jun 3 10:51:07 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 03 Jun 2013 08:51:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21242] csw/mgar/gar/v2 Message-ID: Revision: 21242 http://gar.svn.sourceforge.net/gar/?rev=21242&view=rev Author: pfelecan Date: 2013-06-03 08:51:06 +0000 (Mon, 03 Jun 2013) Log Message: ----------- .buildsys/v2: changed GITHUB_BRANCH to GITHUB_REFERENCE as per Maciej suggestion and tweaked the download process. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2013-06-03 07:55:31 UTC (rev 21241) +++ csw/mgar/gar/v2/gar.conf.mk 2013-06-03 08:51:06 UTC (rev 21242) @@ -767,8 +767,8 @@ ifdef GITHUB_USER GITHUB_PROJECT ?= $(NAME) GITHUB_BALL ?= tar -GITHUB_BRANCH ?= master -GITHUB_MIRROR ?= https://$(GITHUB_HOST)/repos/$(GITHUB_USER)/$(GITHUB_PROJECT)/$(GITHUB_BALL)ball/$(GITHUB_BRANCH) +GITHUB_REFERENCE?= master +GITHUB_MIRROR ?= https://$(GITHUB_HOST)/repos/$(GITHUB_USER)/$(GITHUB_PROJECT)/$(GITHUB_BALL)ball/$(GITHUB_REFERENCE) GITHUB_BALL_EXT := .$(GITHUB_BALL) ifeq ($(GITHUB_BALL),tar) GITHUB_BALL_EXT := $(GITHUB_BALL_EXT).gz Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2013-06-03 07:55:31 UTC (rev 21241) +++ csw/mgar/gar/v2/gar.lib.mk 2013-06-03 08:51:06 UTC (rev 21242) @@ -60,9 +60,10 @@ $(MAKE) -s `echo $$i | tr -d :` || continue; \ case $$i in \ *$(GITHUB_HOST)*) \ - mv $(PARTIALDIR)/$(GITHUB_BRANCH) $(PARTIALDIR)/$(DISTNAME)$(GITHUB_BALL_EXT) ;; \ + mv $(PARTIALDIR)/$(GITHUB_REFERENCE) $@ ;; \ + *) \ + mv $(PARTIALDIR)/$* $@ ;; \ esac; \ - mv $(PARTIALDIR)/$* $@; \ break; \ done; ) 2>&1 | grep -v '^$(MAKE)'; \ if test -r $@ ; then : ; else \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 12:58:17 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 10:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21243] csw/mgar/pkg/xpm/branches Message-ID: Revision: 21243 http://gar.svn.sourceforge.net/gar/?rev=21243&view=rev Author: mattdarcy Date: 2013-06-03 10:58:16 +0000 (Mon, 03 Jun 2013) Log Message: ----------- added a test nim branch Modified Paths: -------------- csw/mgar/pkg/xpm/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/xpm/branches/nim/ Modified: csw/mgar/pkg/xpm/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/xpm/branches/nim/Makefile 2013-06-03 10:58:16 UTC (rev 21243) @@ -1,10 +1,10 @@ -# Copyright 2009 OpenCSW +# Copyright 2009 OpenNIMOSS # Distributed under the terms of the GNU General Public License v2 # $Id$ NAME = libXpm VERSION = 3.5.10 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = X11 pixmap library define BLURB @@ -13,21 +13,21 @@ MASTER_SITES += http://xorg.freedesktop.org/archive/individual/lib/ DISTFILES += $(NAME)-$(VERSION).tar.bz2 -PACKAGES += CSWxpm -SPKG_DESC_CSWxpm = X11 XPM pixmap utilities +PACKAGES += NIMOSSxpm +SPKG_DESC_NIMOSSxpm = X11 XPM pixmap utilities # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWxpm += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWxpm += CSWlibxpm4 +RUNTIME_DEP_PKGS_NIMOSSxpm += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSxpm += NIMOSSlibxpm4 -PACKAGES += CSWlibxpm4 -SPKG_DESC_CSWlibxpm4 += X11 pixmap library, libXpm.so.4 -PKGFILES_CSWlibxpm4 += $(call pkgfiles_lib,libXpm.so.4) -RUNTIME_DEP_PKGS_CSWlibxpm4 += CSWlibintl8 +PACKAGES += NIMOSSlibxpm4 +SPKG_DESC_NIMOSSlibxpm4 += X11 pixmap library, libXpm.so.4 +PKGFILES_NIMOSSlibxpm4 += $(call pkgfiles_lib,libXpm.so.4) +RUNTIME_DEP_PKGS_NIMOSSlibxpm4 += NIMOSSlibintl8 -PACKAGES += CSWlibxpm-dev -SPKG_DESC_CSWlibxpm-dev = Devlopment files for libXpm.so.4 -PKGFILES_CSWlibxpm-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibxpm-dev += CSWlibxpm4 +PACKAGES += NIMOSSlibxpm-dev +SPKG_DESC_NIMOSSlibxpm-dev = Devlopment files for libXpm.so.4 +PKGFILES_NIMOSSlibxpm-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_NIMOSSlibxpm-dev += NIMOSSlibxpm4 BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Mon Jun 3 13:34:49 2013 From: pfelecan at opencsw.org (Peter FELECAN) Date: Mon, 03 Jun 2013 13:34:49 +0200 Subject: [csw-devel] SF.net SVN: gar:[21243] csw/mgar/pkg/xpm/branches In-Reply-To: (mattdarcy@users.sourceforge.net's message of "Mon, 03 Jun 2013 10:58:17 +0000") References: Message-ID: mattdarcy at users.sourceforge.net writes: > +# Copyright 2009 OpenNIMOSS What's NIM? -- Peter From mattdarcy at users.sourceforge.net Mon Jun 3 13:40:12 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 11:40:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21244] csw/mgar/pkg/xpm/branches/nim/Makefile Message-ID: Revision: 21244 http://gar.svn.sourceforge.net/gar/?rev=21244&view=rev Author: mattdarcy Date: 2013-06-03 11:40:11 +0000 (Mon, 03 Jun 2013) Log Message: ----------- appended extra package libs Modified Paths: -------------- csw/mgar/pkg/xpm/branches/nim/Makefile Modified: csw/mgar/pkg/xpm/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/xpm/branches/nim/Makefile 2013-06-03 10:58:16 UTC (rev 21243) +++ csw/mgar/pkg/xpm/branches/nim/Makefile 2013-06-03 11:40:11 UTC (rev 21244) @@ -34,4 +34,6 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += ac_cv_search_gettext=-lintl +EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 13:55:03 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 11:55:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21245] csw/mgar/pkg/libiconv/branches Message-ID: Revision: 21245 http://gar.svn.sourceforge.net/gar/?rev=21245&view=rev Author: mattdarcy Date: 2013-06-03 11:55:03 +0000 (Mon, 03 Jun 2013) Log Message: ----------- Initial creation of libiconv2 package for nim test branch Modified Paths: -------------- csw/mgar/pkg/libiconv/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/libiconv/branches/nim/ Modified: csw/mgar/pkg/libiconv/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/libiconv/branches/nim/Makefile 2013-06-03 11:55:03 UTC (rev 21245) @@ -1,11 +1,11 @@ # # Long-term TODO: -# See branches/sync-pkgname for an attempt to sync the CSW pkg name to +# See branches/sync-pkgname for an attempt to sync the NIMOSS pkg name to # the upstream name and split off a devel pkg. # NAME = libiconv VERSION = 1.14 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = GNU iconv library define BLURB @@ -21,53 +21,53 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PACKAGES += CSWlibiconv2 -CATALOGNAME_CSWlibiconv2 = libiconv2 -SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2 -PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) -OBSOLETED_BY_CSWlibiconv2 += CSWiconv +PACKAGES += NIMOSSlibiconv2 +CATALOGNAME_NIMOSSlibiconv2 = libiconv2 +SPKG_DESC_NIMOSSlibiconv2 = GNU iconv library, libiconv.so.2 +PKGFILES_NIMOSSlibiconv2 += $(call pkgfiles_lib,libiconv.so.2) +OBSOLETED_BY_NIMOSSlibiconv2 += NIMOSSiconv -PACKAGES += CSWlibcharset1 -CATALOGNAME_CSWlibcharset1 = libcharset1 -SPKG_DESC_CSWlibcharset1 = GNU iconv charset library, libcharset.so.1 -PKGFILES_CSWlibcharset1 += $(call pkgfiles_lib,libcharset.so.1) +PACKAGES += NIMOSSlibcharset1 +CATALOGNAME_NIMOSSlibcharset1 = libcharset1 +SPKG_DESC_NIMOSSlibcharset1 = GNU iconv charset library, libcharset.so.1 +PKGFILES_NIMOSSlibcharset1 += $(call pkgfiles_lib,libcharset.so.1) # Now *this* time it is ok, iconv is the only package that is allowed to ship this! -CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias -PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias) -OBSOLETED_BY_CSWlibcharset1 += CSWiconv +CHECKPKG_OVERRIDES_NIMOSSlibcharset1 += disallowed-path|opt/csw/lib/charset.alias +PKGFILES_NIMOSSlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias) +OBSOLETED_BY_NIMOSSlibcharset1 += NIMOSSiconv -PACKAGES += CSWlibiconv-dev -CATALOGNAME_CSWlibiconv-dev = libiconv_dev -SPKG_DESC_CSWlibiconv-dev = Development files for libiconv.so.2 +PACKAGES += NIMOSSlibiconv-dev +CATALOGNAME_NIMOSSlibiconv-dev = libiconv_dev +SPKG_DESC_NIMOSSlibiconv-dev = Development files for libiconv.so.2 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibcharset1 +RUNTIME_DEP_PKGS_NIMOSSlibiconv-dev += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibiconv-dev += NIMOSSlibcharset1 # This is from an example in a comment -CHECKPKG_OVERRIDES_CSWlibiconv-dev += file-with-bad-content|/usr/local|root/opt/csw/include/iconv.h +CHECKPKG_OVERRIDES_NIMOSSlibiconv-dev += file-with-bad-content|/usr/local|root/opt/csw/include/iconv.h -PACKAGES += CSWlibiconv-utils -CATALOGNAME_CSWlibiconv-utils = libiconv_utils -SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs -PKGFILES_CSWlibiconv-utils += $(bindir)/.* -PKGFILES_CSWlibiconv-utils += .*iconv\.1.* -PKGFILES_CSWlibiconv-utils += .*/libiconv\.mo -PKGFILES_CSWlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so) +PACKAGES += NIMOSSlibiconv-utils +CATALOGNAME_NIMOSSlibiconv-utils = libiconv_utils +SPKG_DESC_NIMOSSlibiconv-utils = GNU iconv utility programs +PKGFILES_NIMOSSlibiconv-utils += $(bindir)/.* +PKGFILES_NIMOSSlibiconv-utils += .*iconv\.1.* +PKGFILES_NIMOSSlibiconv-utils += .*/libiconv\.mo +PKGFILES_NIMOSSlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so) # The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it doesn't # matter in any way as this library is only used for LD_PRELOAD and is never being # linked against during compile time. -CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so -CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch -RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 +CHECKPKG_OVERRIDES_NIMOSSlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so +CHECKPKG_OVERRIDES_NIMOSSlibiconv-utils += shared-lib-pkgname-mismatch +RUNTIME_DEP_PKGS_NIMOSSlibiconv-utils += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibiconv-utils += NIMOSSlibintl8 # Removing this dependency to break a dependency cycle. # See: # - http://lists.opencsw.org/pipermail/devel/2011-August/020098.html # -# "CSWiconv needs CSWlibiconv-utils which needs CSWlibintl8 which needs -# CSWiconv" +# "NIMOSSiconv needs NIMOSSlibiconv-utils which needs NIMOSSlibintl8 which needs +# NIMOSSiconv" # -# OBSOLETED_BY_CSWlibiconv-utils += CSWiconv +# OBSOLETED_BY_NIMOSSlibiconv-utils += NIMOSSiconv BUILD64_LIBS_ONLY = 1 @@ -94,7 +94,7 @@ post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) post-install-modulated: ginstall -d $(DOCDEST) - cp $(FILEDIR)/changelog.CSW $(DOCDEST) + cp $(FILEDIR)/changelog.NIMOSS $(DOCDEST) ginstall -D $(WORKSRC)/srcm4/iconv.m4 \ $(DESTDIR)$(datadir)/aclocal/iconv.m4 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 14:10:59 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 12:10:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21246] csw/mgar/pkg/xpm/branches/nim/Makefile Message-ID: Revision: 21246 http://gar.svn.sourceforge.net/gar/?rev=21246&view=rev Author: mattdarcy Date: 2013-06-03 12:10:59 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial NIM XPM test branch package Modified Paths: -------------- csw/mgar/pkg/xpm/branches/nim/Makefile Modified: csw/mgar/pkg/xpm/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/xpm/branches/nim/Makefile 2013-06-03 11:55:03 UTC (rev 21245) +++ csw/mgar/pkg/xpm/branches/nim/Makefile 2013-06-03 12:10:59 UTC (rev 21246) @@ -34,6 +34,6 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += ac_cv_search_gettext=-lintl -EXTRA_PKG_CONFIG_PATH = /opt/csw/X11/lib +EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 14:26:04 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 12:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[21247] csw/mgar/pkg/libiconv/branches/nim/files/changelog. NIMOSS Message-ID: Revision: 21247 http://gar.svn.sourceforge.net/gar/?rev=21247&view=rev Author: mattdarcy Date: 2013-06-03 12:26:04 +0000 (Mon, 03 Jun 2013) Log Message: ----------- added the change log to the nim test build Added Paths: ----------- csw/mgar/pkg/libiconv/branches/nim/files/changelog.NIMOSS Added: csw/mgar/pkg/libiconv/branches/nim/files/changelog.NIMOSS =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 15:11:22 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 13:11:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21248] csw/mgar/pkg/gettext/branches Message-ID: Revision: 21248 http://gar.svn.sourceforge.net/gar/?rev=21248&view=rev Author: mattdarcy Date: 2013-06-03 13:11:21 +0000 (Mon, 03 Jun 2013) Log Message: ----------- Initial package for nim test branch Modified Paths: -------------- csw/mgar/pkg/gettext/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/gettext/branches/nim/ Modified: csw/mgar/pkg/gettext/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/gettext/branches/nim/Makefile 2013-06-03 13:11:21 UTC (rev 21248) @@ -1,6 +1,6 @@ NAME = gettext VERSION = 0.18.1.1 -GARTYPE = v2 +GARTYPE = bts PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc @@ -11,155 +11,155 @@ # a few legacy packages that we still need to depend on for dependency reasons # that we no longer want to rebuild and carry. -FOREIGN_PACKAGES += CSWlibgettextlib0-14-1 -FOREIGN_PACKAGES += CSWlibgettextlib0-17 -FOREIGN_PACKAGES += CSWlibgettextsrc0-17 -FOREIGN_PACKAGES += CSWlibintl2 -FOREIGN_PACKAGES += CSWlibintl3 +FOREIGN_PACKAGES += NIMOSSlibgettextlib0-14-1 +FOREIGN_PACKAGES += NIMOSSlibgettextlib0-17 +FOREIGN_PACKAGES += NIMOSSlibgettextsrc0-17 +FOREIGN_PACKAGES += NIMOSSlibintl2 +FOREIGN_PACKAGES += NIMOSSlibintl3 -BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev CSWlibexpat-dev -BUILD_DEP_PKGS += CSWlibiconv-dev CSWggettext-dev +BUILD_DEP_PKGS += NIMOSSlibncurses-dev NIMOSSlibxml2-dev NIMOSSlibexpat-dev +BUILD_DEP_PKGS += NIMOSSlibiconv-dev NIMOSSggettext-dev -PACKAGES += CSWggettext -PACKAGES += CSWggettextdoc -PACKAGES += CSWlibasprintf0 -PACKAGES += CSWlibgettextlib0-18-1 -PACKAGES += CSWlibgettextpo0 -PACKAGES += CSWlibgettextsrc0-18-1 -PACKAGES += CSWlibintl8 -PACKAGES += CSWggettext-dev -PACKAGES += CSWggettext-data -PACKAGES += CSWggettextrt +PACKAGES += NIMOSSggettext +PACKAGES += NIMOSSggettextdoc +PACKAGES += NIMOSSlibasprintf0 +PACKAGES += NIMOSSlibgettextlib0-18-1 +PACKAGES += NIMOSSlibgettextpo0 +PACKAGES += NIMOSSlibgettextsrc0-18-1 +PACKAGES += NIMOSSlibintl8 +PACKAGES += NIMOSSggettext-dev +PACKAGES += NIMOSSggettext-data +PACKAGES += NIMOSSggettextrt -CATALOGNAME_CSWlibasprintf0 = libasprintf0 -CATALOGNAME_CSWggettext = ggettext -CATALOGNAME_CSWggettextdoc = ggettextdoc -CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1 -CATALOGNAME_CSWlibgettextpo0 = libgettextpo0 -CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1 -CATALOGNAME_CSWlibintl8 = libintl8 -CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1 -CATALOGNAME_CSWggettext-dev = ggettext_dev -CATALOGNAME_CSWggettext-data = ggettext_data -CATALOGNAME_CSWggettextrt = ggettextrt +CATALOGNAME_NIMOSSlibasprintf0 = libasprintf0 +CATALOGNAME_NIMOSSggettext = ggettext +CATALOGNAME_NIMOSSggettextdoc = ggettextdoc +CATALOGNAME_NIMOSSlibgettextlib0-18-1 = libgettextlib0_18_1 +CATALOGNAME_NIMOSSlibgettextpo0 = libgettextpo0 +CATALOGNAME_NIMOSSlibgettextsrc0-18-1 = libgettextsrc0_18_1 +CATALOGNAME_NIMOSSlibintl8 = libintl8 +CATALOGNAME_NIMOSSlibgettextlib0-18-1 = libgettextlib0_18_1 +CATALOGNAME_NIMOSSggettext-dev = ggettext_dev +CATALOGNAME_NIMOSSggettext-data = ggettext_data +CATALOGNAME_NIMOSSggettextrt = ggettextrt -SPKG_DESC_CSWggettext = GNU locale utilities -SPKG_DESC_CSWggettextdoc = GNU locale utility documentation -SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0 -SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files -SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so -SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0 -SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so -SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8 -SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so -SPKG_DESC_CSWggettext-data += GNU locale utilities, translation files -SPKG_DESC_CSWggettextrt += GNU locale utilities, transitional dependency package +SPKG_DESC_NIMOSSggettext = GNU locale utilities +SPKG_DESC_NIMOSSggettextdoc = GNU locale utility documentation +SPKG_DESC_NIMOSSlibasprintf0 += GNU locale utilities, libasprintf.so.0 +SPKG_DESC_NIMOSSggettext-dev = GNU locale utilities, development files +SPKG_DESC_NIMOSSlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so +SPKG_DESC_NIMOSSlibgettextpo0 += GNU locale utilities, libgettextpo.so.0 +SPKG_DESC_NIMOSSlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so +SPKG_DESC_NIMOSSlibintl8 += GNU locale utilities, libintl.so.8 +SPKG_DESC_NIMOSSlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so +SPKG_DESC_NIMOSSggettext-data += GNU locale utilities, translation files +SPKG_DESC_NIMOSSggettextrt += GNU locale utilities, transitional dependency package -RUNTIME_DEP_PKGS_CSWggettext += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl3 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWggettext += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWggettext += CSWggettext-data -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1 -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibgettextpo0 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl2 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl3 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWggettextrt += CSWggettext-data -RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWggettext-data -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWggettext-data -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data -RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibexpat1 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibgettextlib0-14-1 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibgettextlib0-17 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibgettextlib0-18-1 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibgettextsrc0-18-1 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibintl2 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibintl3 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibxml2-2 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSlibncurses5 +RUNTIME_DEP_PKGS_NIMOSSggettext += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibasprintf0 +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibgettextlib0-18-1 +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibgettextpo0 +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibgettextsrc0-17 +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibgettextsrc0-18-1 +RUNTIME_DEP_PKGS_NIMOSSggettext-dev += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSlibasprintf0 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSlibgettextpo0 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSlibintl2 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSlibintl3 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSggettextrt += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSlibasprintf0 += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSlibgettextlib0-18-1 += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibgettextlib0-18-1 += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSlibgettextlib0-18-1 += NIMOSSlibxml2-2 +RUNTIME_DEP_PKGS_NIMOSSlibgettextlib0-18-1 += NIMOSSlibncurses5 +RUNTIME_DEP_PKGS_NIMOSSlibgettextlib0-18-1 += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSlibgettextpo0 += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibgettextpo0 += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSlibgettextpo0 += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSlibgettextlib0-18-1 +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSlibintl8 +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSlibxml2-2 +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSlibncurses5 +RUNTIME_DEP_PKGS_NIMOSSlibgettextsrc0-18-1 += NIMOSSggettext-data +RUNTIME_DEP_PKGS_NIMOSSlibintl8 += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibintl8 += NIMOSSggettext-data -PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so) -PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*) -PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0) -PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*) -PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1) -PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so) -PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*) -PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2) -PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1) -PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*) -PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so) -PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*) -PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0) -PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_STATICLIB) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_LIBTOOL) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_PKGCONFIG) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_INCLUDEDIR) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_ACLOCAL) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE) -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) -PKGFILES_CSWggettest-dev += $(libdir)/libgettextlib.so -PKGFILES_CSWggettest-dev += $(libdir)/libgettextpo.so -PKGFILES_CSWggettest-dev += $(libdir)/libgettextsrc.so -PKGFILES_CSWggettest-dev += $(libdir)/libintl.so -PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo -PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.* -PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) +PKGFILES_NIMOSSlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so) +PKGFILES_NIMOSSlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*) +PKGFILES_NIMOSSlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0) +PKGFILES_NIMOSSlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*) +PKGFILES_NIMOSSlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1) +PKGFILES_NIMOSSlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so) +PKGFILES_NIMOSSlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*) +PKGFILES_NIMOSSlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2) +PKGFILES_NIMOSSlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1) +PKGFILES_NIMOSSlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*) +PKGFILES_NIMOSSlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so) +PKGFILES_NIMOSSlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*) +PKGFILES_NIMOSSlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0) +PKGFILES_NIMOSSlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_CONFIG) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_STATICLIB) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_LIBTOOL) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_PKGCONFIG) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_INCLUDEDIR) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_ACLOCAL) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE) +PKGFILES_NIMOSSggettext-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE) +PKGFILES_NIMOSSggettest-dev += $(libdir)/libgettextlib.so +PKGFILES_NIMOSSggettest-dev += $(libdir)/libgettextpo.so +PKGFILES_NIMOSSggettest-dev += $(libdir)/libgettextsrc.so +PKGFILES_NIMOSSggettest-dev += $(libdir)/libintl.so +PKGFILES_NIMOSSggettext-data += /opt/csw/share/locale/.*mo +PKGFILES_NIMOSSggettextrt += /opt/csw/share/.*ggettextrt.* +PKGFILES_NIMOSSggettextdoc = $(PKGFILES_DOC) -CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWggettext += discouraged-path-in-pkgmap|/opt/csw/share/gettext/archive.git.tar.gz -CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibgettextpo0 -CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0 -CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0 -CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename -CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += soname-equals-filename -CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data -CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data +CHECKPKG_OVERRIDES_NIMOSSggettextdoc += missing-dependency|NIMOSSperl +CHECKPKG_OVERRIDES_NIMOSSggettext += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSggettext += discouraged-path-in-pkgmap|/opt/csw/share/gettext/archive.git.tar.gz +CHECKPKG_OVERRIDES_NIMOSSggettext += missing-dependency|NIMOSSemacscommon +CHECKPKG_OVERRIDES_NIMOSSggettextrt += surplus-dependency|NIMOSSlibintl8 +CHECKPKG_OVERRIDES_NIMOSSggettextrt += surplus-dependency|NIMOSSlibgettextpo0 +CHECKPKG_OVERRIDES_NIMOSSggettextrt += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSggettextrt += surplus-dependency|NIMOSSlibasprintf0 +CHECKPKG_OVERRIDES_NIMOSSlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0 +CHECKPKG_OVERRIDES_NIMOSSlibgettextpo0 += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSlibgettextsrc0-18-1 += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSlibgettextsrc0-18-1 += soname-equals-filename +CHECKPKG_OVERRIDES_NIMOSSlibgettextlib0-18-1 += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSlibgettextlib0-18-1 += soname-equals-filename +CHECKPKG_OVERRIDES_NIMOSSlibintl8 += surplus-dependency|NIMOSSggettext-data +CHECKPKG_OVERRIDES_NIMOSSlibasprintf0 += surplus-dependency|NIMOSSggettext-data -CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4 -CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4 +CHECKPKG_OVERRIDES_NIMOSSggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4 +CHECKPKG_OVERRIDES_NIMOSSggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4 -CHECKPKG_OVERRIDES_CSWggettextdoc += file-with-bad-content +CHECKPKG_OVERRIDES_NIMOSSggettextdoc += file-with-bad-content -ARCHALL_CSWggettextrt = 1 -ARCHALL_CSWggettext-data = 1 -ARCHALL_CSWggettextdoc = 1 +ARCHALL_NIMOSSggettextrt = 1 +ARCHALL_NIMOSSggettext-data = 1 +ARCHALL_NIMOSSggettextdoc = 1 COMPILE_ELISP = 1 MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += CSWggettextdoc.cswreleasenotes -DISTFILES += CSWggettext.cswreleasenotes +DISTFILES += NIMOSSggettextdoc.cswreleasenotes +DISTFILES += NIMOSSggettext.cswreleasenotes PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch PATCHFILES += 0002-Update-ltmain.sh-to-prevent-libtool-stripping-runpat.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 16:29:03 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 14:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21249] csw/mgar/pkg/bdb48/branches Message-ID: Revision: 21249 http://gar.svn.sourceforge.net/gar/?rev=21249&view=rev Author: mattdarcy Date: 2013-06-03 14:29:03 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial package creation for nim test branch Modified Paths: -------------- csw/mgar/pkg/bdb48/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/bdb48/branches/nim/ Modified: csw/mgar/pkg/bdb48/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/bdb48/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/bdb48/branches/nim/Makefile 2013-06-03 14:29:03 UTC (rev 21249) @@ -1,6 +1,6 @@ NAME = db VERSION = 4.8.30 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = Berkeley DB 4.8 define BLURB @@ -48,27 +48,27 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb48 CSWbdb48devel CSWbdb48doc +PACKAGES = NIMOSSbdb48 NIMOSSbdb48devel NIMOSSbdb48doc -CATALOGNAME_CSWbdb48 = berkeleydb48 -CATALOGNAME_CSWbdb48devel = berkeleydb48_devel -CATALOGNAME_CSWbdb48doc = berkeleydb48_doc +CATALOGNAME_NIMOSSbdb48 = berkeleydb48 +CATALOGNAME_NIMOSSbdb48devel = berkeleydb48_devel +CATALOGNAME_NIMOSSbdb48doc = berkeleydb48_doc -ARCHALL_CSWbdb48doc = 1 +ARCHALL_NIMOSSbdb48doc = 1 -SPKG_DESC_CSWbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities -SPKG_DESC_CSWbdb48devel = BerkeleyDB 4.8 development support -SPKG_DESC_CSWbdb48doc = BerkeleyDB 4.8 documentation +SPKG_DESC_NIMOSSbdb48 = BerkeleyDB 4.8 embedded database libraries and utilities +SPKG_DESC_NIMOSSbdb48devel = BerkeleyDB 4.8 development support +SPKG_DESC_NIMOSSbdb48doc = BerkeleyDB 4.8 documentation SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html -RUNTIME_DEP_PKGS_CSWbdb48devel = CSWbdb48 -CHECKPKG_OVERRIDES_CSWbdb48devel += surplus-dependency|CSWbdb48 -CHECKPKG_OVERRIDES_CSWbdb48 += missing-dependency|CSWbdb48devel +RUNTIME_DEP_PKGS_NIMOSSbdb48devel = NIMOSSbdb48 +CHECKPKG_OVERRIDES_NIMOSSbdb48devel += surplus-dependency|NIMOSSbdb48 +CHECKPKG_OVERRIDES_NIMOSSbdb48 += missing-dependency|NIMOSSbdb48devel LICENSE = LICENSE -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb48),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_NIMOSSbdb48),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar @@ -76,11 +76,11 @@ # because GAR expects license to be a file instead of a directory EXTRA_MERGE_EXCLUDE_FILES = .*/license.* -PKGFILES_CSWbdb48doc = $(PKGFILES_DOC) -PKGFILES_CSWbdb48devel = $(includedir)/.* +PKGFILES_NIMOSSbdb48doc = $(PKGFILES_DOC) +PKGFILES_NIMOSSbdb48devel = $(includedir)/.* # Compiler run pathes, skip for now. -CHECKPKG_OVERRIDES_CSWbdb48 += bad-rpath-entry +CHECKPKG_OVERRIDES_NIMOSSbdb48 += bad-rpath-entry include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 3 17:51:15 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jun 2013 15:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21250] csw/mgar/pkg/cloog/trunk Message-ID: Revision: 21250 http://gar.svn.sourceforge.net/gar/?rev=21250&view=rev Author: wahwah Date: 2013-06-03 15:51:15 +0000 (Mon, 03 Jun 2013) Log Message: ----------- cloog/trunk: version bump to 0.18.0 Modified Paths: -------------- csw/mgar/pkg/cloog/trunk/Makefile csw/mgar/pkg/cloog/trunk/checksums Modified: csw/mgar/pkg/cloog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 14:29:03 UTC (rev 21249) +++ csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 15:51:15 UTC (rev 21250) @@ -3,7 +3,7 @@ # $Id$ NAME = cloog -VERSION = 0.16.3 +VERSION = 0.18.0 GARTYPE = v2 DESCRIPTION = Code Generator in the Polyhedral Model define BLURB @@ -17,15 +17,16 @@ LICENSE = $(FILEDIR)/COPYING -BUILD_DEP_PKGS = CSWlibppl-dev +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +# BUILD_DEP_PKGS = CSWlibppl-dev + PACKAGES += CSWlibcloog-isl2 PKGFILES_CSWlibcloog-isl2 += $(call baseisadirs,$(libdir),libcloog-isl\.so\.2(\.\d+)*) SPKG_DESC_CSWlibcloog-isl2 += $(DESCRIPTION), libcloog-isl.so.2 RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibgmp10 RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibisl7 - PACKAGES += CSWlibisl7 PKGFILES_CSWlibisl7 += $(call baseisadirs,$(libdir),libisl\.so\.7(\.\d+)*) SPKG_DESC_CSWlibisl7 += $(DESCRIPTION), libisl.so.7 Modified: csw/mgar/pkg/cloog/trunk/checksums =================================================================== --- csw/mgar/pkg/cloog/trunk/checksums 2013-06-03 14:29:03 UTC (rev 21249) +++ csw/mgar/pkg/cloog/trunk/checksums 2013-06-03 15:51:15 UTC (rev 21250) @@ -1 +1 @@ -a0f8a241cd1c4f103f8d2c91642b3498 cloog-0.16.3.tar.gz +be78a47bd82523250eb3e91646db5b3d cloog-0.18.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 17:56:36 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 15:56:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[21251] csw/mgar/pkg/zlib/branches Message-ID: Revision: 21251 http://gar.svn.sourceforge.net/gar/?rev=21251&view=rev Author: mattdarcy Date: 2013-06-03 15:56:35 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial nim test branch package Modified Paths: -------------- csw/mgar/pkg/zlib/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/zlib/branches/nim/ Modified: csw/mgar/pkg/zlib/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/zlib/branches/nim/Makefile 2013-06-03 15:56:35 UTC (rev 21251) @@ -2,7 +2,7 @@ NAME = zlib VERSION = 1.2.7 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = Zlib data compression library define BLURB @@ -26,15 +26,15 @@ PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch PATCHFILES += configure.diff -PACKAGES += CSWlibz1 -SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 -PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1) -OBSOLETED_BY_CSWlibz1 = CSWzlib +PACKAGES += NIMOSSlibz1 +SPKG_DESC_NIMOSSlibz1 = Zlib data compression library, libz.so.1 +PKGFILES_NIMOSSlibz1 = $(call pkgfiles_lib,libz.so.1) +OBSOLETED_BY_NIMOSSlibz1 = NIMOSSzlib -PACKAGES += CSWlibz-dev -SPKG_DESC_CSWlibz-dev = Development files for libz.so.1 +PACKAGES += NIMOSSlibz-dev +SPKG_DESC_NIMOSSlibz-dev = Development files for libz.so.1 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibz-dev = CSWlibz1 +RUNTIME_DEP_PKGS_NIMOSSlibz-dev = NIMOSSlibz1 BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 18:04:15 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:04:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21253] csw/mgar/pkg/libpng/branches Message-ID: Revision: 21253 http://gar.svn.sourceforge.net/gar/?rev=21253&view=rev Author: mattdarcy Date: 2013-06-03 16:04:14 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial libpng3 package checkin for nim test branch Modified Paths: -------------- csw/mgar/pkg/libpng/branches/nimlibpng3/Makefile Added Paths: ----------- csw/mgar/pkg/libpng/branches/nimlibpng3/ Modified: csw/mgar/pkg/libpng/branches/nimlibpng3/Makefile =================================================================== --- csw/mgar/pkg/libpng/branches/libpng3/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/libpng/branches/nimlibpng3/Makefile 2013-06-03 16:04:14 UTC (rev 21253) @@ -1,8 +1,8 @@ -# Copyright 2009 OpenCSW +# Copyright 2009 OpenNIMOSS # Distributed under the terms of the GNU General Public License v2 # $Id$ # -# ! The transitional package CSWpng must also pull in libpng.so.3 and +# ! The transitional package NIMOSSpng must also pull in libpng.so.3 and # libpng12.so.0 # * Would be good to also provide ISAs: # sparcv8plus+vis @@ -12,6 +12,7 @@ NAME = libpng VERSION = 1.2.50 CATEGORIES = lib +GARTYPE = bts DESCRIPTION = The official library for Portable Network Graphics format (PNG) define BLURB @@ -29,26 +30,26 @@ EXTRA_BUILD_ISAS += sparcv8plus+vis2 EXTRA_BUILD_ISAS += pentium_pro -PACKAGES = CSWlibpng-dev -SPKG_DESC_CSWlibpng-dev = $(DESCRIPTION), development files -RUNTIME_DEP_PKGS_CSWlibpng-dev += CSWlibpng3 -RUNTIME_DEP_PKGS_CSWlibpng-dev += CSWlibpng12-0 +PACKAGES = NIMOSSlibpng-dev +SPKG_DESC_NIMOSSlibpng-dev = $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_NIMOSSlibpng-dev += NIMOSSlibpng3 +RUNTIME_DEP_PKGS_NIMOSSlibpng-dev += NIMOSSlibpng12-0 -PACKAGES += CSWlibpng3 -CATALOGNAME_CSWlibpng3 = libpng3 -PKGFILES_CSWlibpng3 += $(call baseisadirs,$(libdir),libpng\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibpng3 += $(DESCRIPTION), libpng.so.3 -RUNTIME_DEP_PKGS_CSWlibpng += CSWlibpng3 -OBSOLETED_BY_CSWlibpng3 += CSWpng -RUNTIME_DEP_PKGS_CSWlibpng3 += CSWlibz1 +PACKAGES += NIMOSSlibpng3 +CATALOGNAME_NIMOSSlibpng3 = libpng3 +PKGFILES_NIMOSSlibpng3 += $(call baseisadirs,$(libdir),libpng\.so\.3(\.\d+)*) +SPKG_DESC_NIMOSSlibpng3 += $(DESCRIPTION), libpng.so.3 +RUNTIME_DEP_PKGS_NIMOSSlibpng += NIMOSSlibpng3 +OBSOLETED_BY_NIMOSSlibpng3 += NIMOSSpng +RUNTIME_DEP_PKGS_NIMOSSlibpng3 += NIMOSSlibz1 -PACKAGES += CSWlibpng12-0 -CATALOGNAME_CSWlibpng12-0 = libpng12_0 -PKGFILES_CSWlibpng12-0 += $(call baseisadirs,$(libdir),libpng12\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibpng12-0 += $(DESCRIPTION), libpng12.so.0 -RUNTIME_DEP_PKGS_CSWlibpng += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibpng12-0 += CSWlibz1 -OBSOLETED_BY_CSWlibpng12-0 += CSWpng +PACKAGES += NIMOSSlibpng12-0 +CATALOGNAME_NIMOSSlibpng12-0 = libpng12_0 +PKGFILES_NIMOSSlibpng12-0 += $(call baseisadirs,$(libdir),libpng12\.so\.0(\.\d+)*) +SPKG_DESC_NIMOSSlibpng12-0 += $(DESCRIPTION), libpng12.so.0 +RUNTIME_DEP_PKGS_NIMOSSlibpng += NIMOSSlibpng12-0 +RUNTIME_DEP_PKGS_NIMOSSlibpng12-0 += NIMOSSlibz1 +OBSOLETED_BY_NIMOSSlibpng12-0 += NIMOSSpng BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Jun 3 18:04:14 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:04:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21252] csw/mgar/pkg/lang-python/pyelftools/trunk Message-ID: Revision: 21252 http://gar.svn.sourceforge.net/gar/?rev=21252&view=rev Author: chninkel Date: 2013-06-03 16:04:13 +0000 (Mon, 03 Jun 2013) Log Message: ----------- lang-python/pyelftools/trunk: updated to 0.21 Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile csw/mgar/pkg/lang-python/pyelftools/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-06-03 15:56:35 UTC (rev 21251) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-06-03 16:04:13 UTC (rev 21252) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = pyelftools -VERSION = 0.20 +VERSION = 0.21 GARTYPE = v2 DESCRIPTION = Library for analyzing ELF files and DWARF debugging information @@ -17,8 +17,6 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -PATCHFILES += 0001-Updated-list-of-e_machine-values.patch - TEST_SCRIPTS = ARCHALL_CSWpy-pyelftools = 1 Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2013-06-03 15:56:35 UTC (rev 21251) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/checksums 2013-06-03 16:04:13 UTC (rev 21252) @@ -1 +1 @@ -5ac7b279a01c41e5b022a1a382eb9d92 pyelftools-0.20.tar.gz +fe1039193675cb9d0ddf60d1431fbea3 pyelftools-0.21.tar.gz Deleted: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch 2013-06-03 15:56:35 UTC (rev 21251) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch 2013-06-03 16:04:13 UTC (rev 21252) @@ -1,117 +0,0 @@ -From e384aee31c66e285fe0404d54e633ba2f82a0c69 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Mon, 15 Apr 2013 00:53:00 +0200 -Subject: [PATCH] Updated list of e_machine values. - -Source: -http://www.scs.stanford.edu/11wi-cs140/pintos/specs/sysv-abi-update.html/ch4.eheader.html - -Also for Solaris-relevant stuff: -http://docs.oracle.com/cd/E26505_01/html/E26506/chapter6-43405.html ---- - elftools/elf/enums.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 72 insertions(+), 4 deletions(-) - -diff --git a/elftools/elf/enums.py b/elftools/elf/enums.py -index 78302ae..72f4fa0 100644 ---- a/elftools/elf/enums.py -+++ b/elftools/elf/enums.py -@@ -65,7 +65,8 @@ ENUM_E_TYPE = dict( - ) - - # e_machine in the ELF header --# (this list is currently somewhat partial...) -+# Source: -+# http://www.scs.stanford.edu/11wi-cs140/pintos/specs/sysv-abi-update.html/ch4.eheader.html - ENUM_E_MACHINE = dict( - EM_NONE=0, - EM_M32=1, -@@ -73,15 +74,82 @@ ENUM_E_MACHINE = dict( - EM_386=3, - EM_68K=4, - EM_88K=5, -- EM_486=6, - EM_860=7, - EM_MIPS=8, - EM_S370=9, -- EM_MIPS_RS4_BE=10, -+ EM_MIPS_RS3_LE=10, -+ EM_PARISC=15, -+ EM_VPP500=17, -+ EM_SPARC32PLUS=18, -+ EM_960=19, -+ EM_PPC=20, -+ EM_PPC64=21, -+ EM_S390=22, -+ EM_V800=36, -+ EM_FR20=37, -+ EM_RH32=38, -+ EM_RCE=39, -+ EM_ARM=40, -+ EM_ALPHA=41, -+ EM_SH=42, -+ EM_SPARCV9=43, -+ EM_TRICORE=44, -+ EM_ARC=45, -+ EM_H8_300=46, -+ EM_H8_300H=47, -+ EM_H8S=48, -+ EM_H8_500=49, - EM_IA_64=50, -+ EM_MIPS_X=51, -+ EM_COLDFIRE=52, -+ EM_68HC12=53, -+ EM_MMA=54, -+ EM_PCP=55, -+ EM_NCPU=56, -+ EM_NDR1=57, -+ EM_STARCORE=58, -+ EM_ME16=59, -+ EM_ST100=60, -+ EM_TINYJ=61, - EM_X86_64=62, -+ EM_PDSP=63, -+ EM_PDP10=64, -+ EM_PDP11=65, -+ EM_FX66=66, -+ EM_ST9PLUS=67, -+ EM_ST7=68, -+ EM_68HC16=69, -+ EM_68HC11=70, -+ EM_68HC08=71, -+ EM_68HC05=72, -+ EM_SVX=73, -+ EM_ST19=74, -+ EM_VAX=75, -+ EM_CRIS=76, -+ EM_JAVELIN=77, -+ EM_FIREPATH=78, -+ EM_ZSP=79, -+ EM_MMIX=80, -+ EM_HUANY=81, -+ EM_PRISM=82, - EM_AVR=83, -- EM_L10M=180, -+ EM_FR30=84, -+ EM_D10V=85, -+ EM_D30V=86, -+ EM_V850=87, -+ EM_M32R=88, -+ EM_MN10300=89, -+ EM_MN10200=90, -+ EM_PJ=91, -+ EM_OPENRISC=92, -+ EM_ARC_A5=93, -+ EM_XTENSA=94, -+ EM_VIDEOCORE=95, -+ EM_TMM_GPP=96, -+ EM_NS32K=97, -+ EM_TPC=98, -+ EM_SNP1K=99, -+ EM_ST200=100, - _default_=Pass, - ) - --- -1.8.1.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 Jun 3 18:07:10 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:07:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[21254] csw/mgar/pkg/lang-python/pyelftools/trunk Message-ID: Revision: 21254 http://gar.svn.sourceforge.net/gar/?rev=21254&view=rev Author: chninkel Date: 2013-06-03 16:07:09 +0000 (Mon, 03 Jun 2013) Log Message: ----------- lang-python/pyelftools/trunk: updated to last upstream code + symbol versioning support Modified Paths: -------------- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-06-03 16:04:14 UTC (rev 21253) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile 2013-06-03 16:07:09 UTC (rev 21254) @@ -17,6 +17,8 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PATCHFILES += 0001-syminfo+symbol_versioning_support.patch + TEST_SCRIPTS = ARCHALL_CSWpy-pyelftools = 1 Added: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch =================================================================== --- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch (rev 0) +++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-syminfo+symbol_versioning_support.patch 2013-06-03 16:07:09 UTC (rev 21254) @@ -0,0 +1,2070 @@ +diff -r 249a5ca85159 CHANGES +--- a/CHANGES Wed Apr 17 05:57:58 2013 -0700 ++++ b/CHANGES Mon Jun 03 17:52:42 2013 +0200 +@@ -1,7 +1,14 @@ + Changelog + ========= + +-+ Version 0.22 (17.04.2013) +++ Version 0.22 (??) ++ ++ - Added some initial support for parsing Solaris OpenCSW ELF files ++ (contributed by Yann Rouillard). ++ - Added some initial support for DWARF4 (as generated by gcc 4.8) ++ and DWARF generated by recent versions of Clang (3.3). ++ +++ Version 0.21 (17.04.2013) + + - Added new example: dwarf_decode_address - decode function name and + file & line information from an address. +diff -r 249a5ca85159 elftools/dwarf/callframe.py +--- a/elftools/dwarf/callframe.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/callframe.py Mon Jun 03 17:52:42 2013 +0200 +@@ -26,13 +26,13 @@ + Eventually, each entry gets its own structs based on the initial + length field it starts with. The address_size, however, is taken + from base_structs. This appears to be a limitation of the DWARFv3 +- standard, fixed in v4 (where an address_size field exists for each +- CFI. A discussion I had on dwarf-discuss confirms this. +- Currently for base_structs I simply use the elfclass of the +- containing file, but more sophisticated methods are used by +- libdwarf and others, such as guessing which CU contains which FDEs +- (based on their address ranges) and taking the address_size from +- those CUs. ++ standard, fixed in v4. ++ A discussion I had on dwarf-discuss confirms this. ++ So for DWARFv4 we'll take the address size from the CIE header, ++ but for earlier versions will use the elfclass of the containing ++ file; more sophisticated methods are used by libdwarf and others, ++ such as guessing which CU contains which FDEs (based on their ++ address ranges) and taking the address_size from those CUs. + """ + def __init__(self, stream, size, base_structs): + self.stream = stream +@@ -99,6 +99,14 @@ + header = struct_parse( + header_struct, self.stream, offset) + ++ # If this is DWARF version 4 or later, we can have a more precise ++ # address size, read from the CIE header. ++ if entry_structs.dwarf_version >= 4: ++ entry_structs = DWARFStructs( ++ little_endian=entry_structs.little_endian, ++ dwarf_format=entry_structs.dwarf_format, ++ address_size=header.address_size) ++ + # For convenience, compute the end offset for this entry + end_offset = ( + offset + header.length + +diff -r 249a5ca85159 elftools/dwarf/descriptions.py +--- a/elftools/dwarf/descriptions.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/descriptions.py Mon Jun 03 17:52:42 2013 +0200 +@@ -197,6 +197,12 @@ + """ + return '1' if attr.value else '0' + ++def _describe_attr_present(attr, die, section_offset): ++ """ Some forms may simply mean that an attribute is present, ++ without providing any value. ++ """ ++ return '1' ++ + def _describe_attr_block(attr, die, section_offset): + s = '%s byte block: ' % len(attr.value) + s += ' '.join('%x' % item for item in attr.value) + ' ' +@@ -227,6 +233,9 @@ + DW_FORM_block2=_describe_attr_block, + DW_FORM_block4=_describe_attr_block, + DW_FORM_block=_describe_attr_block, ++ DW_FORM_flag_present=_describe_attr_present, ++ DW_FORM_exprloc=_describe_attr_block, ++ DW_FORM_ref_sig8=_describe_attr_ref, + ) + + +diff -r 249a5ca85159 elftools/dwarf/dwarfinfo.py +--- a/elftools/dwarf/dwarfinfo.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/dwarfinfo.py Mon Jun 03 17:52:42 2013 +0200 +@@ -21,7 +21,7 @@ + + + # Describes a debug section +-# ++# + # stream: a stream object containing the data of this section + # name: section name in the container file + # global_offset: the global offset of the section in its container file +@@ -30,7 +30,7 @@ + # 'name' and 'global_offset' are for descriptional purposes only and + # aren't strictly required for the DWARF parsing to work. + # +-DebugSectionDescriptor = namedtuple('DebugSectionDescriptor', ++DebugSectionDescriptor = namedtuple('DebugSectionDescriptor', + 'stream name global_offset size') + + +@@ -51,7 +51,7 @@ + + + class DWARFInfo(object): +- """ Acts also as a "context" to other major objects, bridging between ++ """ Acts also as a "context" to other major objects, bridging between + various parts of the debug infromation. + """ + def __init__(self, +@@ -59,6 +59,7 @@ + debug_info_sec, + debug_abbrev_sec, + debug_frame_sec, ++ eh_frame_sec, + debug_str_sec, + debug_loc_sec, + debug_ranges_sec, +@@ -68,19 +69,20 @@ + + debug_*_sec: + DebugSectionDescriptor for a section. Pass None for sections +- that don't exist. These arguments are best given with ++ that don't exist. These arguments are best given with + keyword syntax. + """ + self.config = config + self.debug_info_sec = debug_info_sec + self.debug_abbrev_sec = debug_abbrev_sec + self.debug_frame_sec = debug_frame_sec ++ self.eh_frame_sec = eh_frame_sec + self.debug_str_sec = debug_str_sec + self.debug_loc_sec = debug_loc_sec + self.debug_ranges_sec = debug_ranges_sec + self.debug_line_sec = debug_line_sec + +- # This is the DWARFStructs the context uses, so it doesn't depend on ++ # This is the DWARFStructs the context uses, so it doesn't depend on + # DWARF format and address_size (these are determined per CU) - set them + # to default values. + self.structs = DWARFStructs( +@@ -119,7 +121,7 @@ + return self._abbrevtable_cache[offset] + + def get_string_from_table(self, offset): +- """ Obtain a string from the string table section, given an offset ++ """ Obtain a string from the string table section, given an offset + relative to the section. + """ + return parse_cstring_from_stream(self.debug_str_sec.stream, offset) +@@ -139,12 +141,12 @@ + return None + + def has_CFI(self): +- """ Does this dwarf info has a CFI section? ++ """ Does this dwarf info have a dwarf_frame CFI section? + """ + return self.debug_frame_sec is not None + + def CFI_entries(self): +- """ Get a list of CFI entries from the .debug_frame section. ++ """ Get a list of dwarf_frame CFI entries from the .debug_frame section. + """ + cfi = CallFrameInfo( + stream=self.debug_frame_sec.stream, +@@ -152,6 +154,20 @@ + base_structs=self.structs) + return cfi.get_entries() + ++ def has_EH_CFI(self): ++ """ Does this dwarf info have a eh_frame CFI section? ++ """ ++ return self.eh_frame_sec is not None ++ ++ def EH_CFI_entries(self): ++ """ Get a list of eh_frame CFI entries from the .eh_frame section. ++ """ ++ cfi = CallFrameInfo( ++ stream=self.eh_frame_sec.stream, ++ size=self.eh_frame_sec.size, ++ base_structs=self.structs) ++ return cfi.get_entries() ++ + def location_lists(self): + """ Get a LocationLists object representing the .debug_loc section of + the DWARF data, or None if this section doesn't exist. +@@ -175,18 +191,18 @@ + # Compute the offset of the next CU in the section. The unit_length + # field of the CU header contains its size not including the length + # field itself. +- offset = ( offset + +- cu['unit_length'] + ++ offset = ( offset + ++ cu['unit_length'] + + cu.structs.initial_length_field_size()) + yield cu +- ++ + def _parse_CU_at_offset(self, offset): + """ Parse and return a CU at the given offset in the debug_info stream. + """ + # Section 7.4 (32-bit and 64-bit DWARF Formats) of the DWARF spec v3 +- # states that the first 32-bit word of the CU header determines ++ # states that the first 32-bit word of the CU header determines + # whether the CU is represented with 32-bit or 64-bit DWARF format. +- # ++ # + # So we peek at the first word in the CU header to determine its + # dwarf format. Based on it, we then create a new DWARFStructs + # instance suitable for this CU and use it to parse the rest. +@@ -205,15 +221,15 @@ + little_endian=self.config.little_endian, + dwarf_format=dwarf_format, + address_size=4) +- ++ + cu_header = struct_parse( + cu_structs.Dwarf_CU_header, self.debug_info_sec.stream, offset) + if cu_header['address_size'] == 8: + cu_structs = DWARFStructs( + little_endian=self.config.little_endian, + dwarf_format=dwarf_format, +- address_size=8) +- ++ address_size=8) ++ + cu_die_offset = self.debug_info_sec.stream.tell() + dwarf_assert( + self._is_supported_version(cu_header['version']), +@@ -224,11 +240,11 @@ + structs=cu_structs, + cu_offset=offset, + cu_die_offset=cu_die_offset) +- ++ + def _is_supported_version(self, version): + """ DWARF version supported by this parser + """ +- return 2 <= version <= 3 ++ return 2 <= version <= 4 + + def _parse_line_program_at_offset(self, debug_line_offset, structs): + """ Given an offset to the .debug_line section, parse the line program +diff -r 249a5ca85159 elftools/dwarf/enums.py +--- a/elftools/dwarf/enums.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/enums.py Mon Jun 03 17:52:42 2013 +0200 +@@ -185,7 +185,9 @@ + DW_AT_main_subprogram = 0x6a, + DW_AT_data_bit_offset = 0x6b, + DW_AT_const_expr = 0x6c, +- ++ DW_AT_enum_class = 0x6d, ++ DW_AT_linkage_name = 0x6e, ++ + DW_AT_MIPS_fde = 0x2001, + DW_AT_MIPS_loop_begin = 0x2002, + DW_AT_MIPS_tail_loop_begin = 0x2003, +@@ -197,8 +199,46 @@ + DW_AT_MIPS_abstract_name = 0x2009, + DW_AT_MIPS_clone_origin = 0x200a, + DW_AT_MIPS_has_inlines = 0x200b, ++ DW_AT_MIPS_stride_byte = 0x200c, ++ DW_AT_MIPS_stride_elem = 0x200d, ++ DW_AT_MIPS_ptr_dopetype = 0x200e, ++ DW_AT_MIPS_allocatable_dopetype = 0x200f, ++ DW_AT_MIPS_assumed_shape_dopetype = 0x2010, ++ DW_AT_MIPS_assumed_size = 0x2011, + +- _default_ = Pass, ++ DW_AT_sf_names = 0x2101, ++ DW_AT_src_info = 0x2102, ++ DW_AT_mac_info = 0x2103, ++ DW_AT_src_coords = 0x2104, ++ DW_AT_body_begin = 0x2105, ++ DW_AT_body_end = 0x2106, ++ DW_AT_GNU_vector = 0x2107, ++ DW_AT_GNU_template_name = 0x2110, ++ ++ DW_AT_GNU_call_site_value = 0x2111, ++ DW_AT_GNU_call_site_data_value = 0x2112, ++ DW_AT_GNU_call_site_target = 0x2113, ++ DW_AT_GNU_call_site_target_clobbered = 0x2114, ++ DW_AT_GNU_tail_call = 0x2115, ++ DW_AT_GNU_all_tail_call_sites = 0x2116, ++ DW_AT_GNU_all_call_sites = 0x2117, ++ DW_AT_GNU_all_source_call_sites = 0x2118, ++ ++ DW_AT_APPLE_optimized = 0x3fe1, ++ DW_AT_APPLE_flags = 0x3fe2, ++ DW_AT_APPLE_isa = 0x3fe3, ++ DW_AT_APPLE_block = 0x3fe4, ++ DW_AT_APPLE_major_runtime_vers = 0x3fe5, ++ DW_AT_APPLE_runtime_class = 0x3fe6, ++ DW_AT_APPLE_omit_frame_ptr = 0x3fe7, ++ DW_AT_APPLE_property_name = 0x3fe8, ++ DW_AT_APPLE_property_getter = 0x3fe9, ++ DW_AT_APPLE_property_setter = 0x3fea, ++ DW_AT_APPLE_property_attribute = 0x3feb, ++ DW_AT_APPLE_objc_complete_type = 0x3fec, ++ DW_AT_APPLE_property = 0x3fed, ++ ++ _default_ = Pass, + ) + + +@@ -225,6 +265,10 @@ + DW_FORM_ref8 = 0x14, + DW_FORM_ref_udata = 0x15, + DW_FORM_indirect = 0x16, ++ DW_FORM_sec_offset = 0x17, ++ DW_FORM_exprloc = 0x18, ++ DW_FORM_flag_present = 0x19, ++ DW_FORM_ref_sig8 = 0x20, + + _default_ = Pass, + ) +diff -r 249a5ca85159 elftools/dwarf/lineprogram.py +--- a/elftools/dwarf/lineprogram.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/lineprogram.py Mon Jun 03 17:52:42 2013 +0200 +@@ -215,10 +215,10 @@ + add_entry_old_state(opcode, [operand]) + elif opcode == DW_LNS_negate_stmt: + state.is_stmt = not state.is_stmt +- add_entry_old_state(opcode, [operand]) ++ add_entry_old_state(opcode, []) + elif opcode == DW_LNS_set_basic_block: + state.basic_block = True +- add_entry_old_state(opcode, [operand]) ++ add_entry_old_state(opcode, []) + elif opcode == DW_LNS_const_add_pc: + adjusted_opcode = 255 - self['opcode_base'] + address_addend = ((adjusted_opcode // self['line_range']) * +diff -r 249a5ca85159 elftools/dwarf/structs.py +--- a/elftools/dwarf/structs.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/dwarf/structs.py Mon Jun 03 17:52:42 2013 +0200 +@@ -11,7 +11,7 @@ + UBInt8, UBInt16, UBInt32, UBInt64, ULInt8, ULInt16, ULInt32, ULInt64, + SBInt8, SBInt16, SBInt32, SBInt64, SLInt8, SLInt16, SLInt32, SLInt64, + Adapter, Struct, ConstructError, If, RepeatUntil, Field, Rename, Enum, +- Array, PrefixedArray, CString, Embed, ++ Array, PrefixedArray, CString, Embed, StaticField + ) + from ..common.construct_utils import RepeatUntilExcluding + +@@ -19,39 +19,39 @@ + + + class DWARFStructs(object): +- """ Exposes Construct structs suitable for parsing information from DWARF ++ """ Exposes Construct structs suitable for parsing information from DWARF + sections. Each compile unit in DWARF info can have its own structs +- object. Keep in mind that these structs have to be given a name (by ++ object. Keep in mind that these structs have to be given a name (by + calling them with a name) before being used for parsing (like other + Construct structs). Those that should be used without a name are marked + by (+). +- ++ + Accessible attributes (mostly as described in chapter 7 of the DWARF + spec v3): +- ++ + Dwarf_[u]int{8,16,32,64): + Data chunks of the common sizes +- ++ + Dwarf_offset: + 32-bit or 64-bit word, depending on dwarf_format +- ++ + Dwarf_target_addr: + 32-bit or 64-bit word, depending on address size +- ++ + Dwarf_initial_length: + "Initial length field" encoding + section 7.4 +- ++ + Dwarf_{u,s}leb128: + ULEB128 and SLEB128 variable-length encoding +- ++ + Dwarf_CU_header (+): + Compilation unit header +- ++ + Dwarf_abbrev_declaration (+): + Abbreviation table declaration - doesn't include the initial + code, only the contents. +- ++ + Dwarf_dw_form (+): + A dictionary mapping 'DW_FORM_*' keys into construct Structs + that parse such forms. These Structs have already been given +@@ -62,7 +62,7 @@ + + Dwarf_lineprog_file_entry (+): + A single file entry in a line program header or instruction +- ++ + Dwarf_CIE_header (+): + A call-frame CIE + +@@ -71,22 +71,27 @@ + + See also the documentation of public methods. + """ +- def __init__(self, little_endian, dwarf_format, address_size): +- """ little_endian: ++ def __init__(self, ++ little_endian, dwarf_format, address_size, dwarf_version=2): ++ """ dwarf_version: ++ Numeric DWARF version ++ ++ little_endian: + True if the file is little endian, False if big +- ++ + dwarf_format: + DWARF Format: 32 or 64-bit (see spec section 7.4) +- ++ + address_size: +- Target machine address size, in bytes (4 or 8). (See spec ++ Target machine address size, in bytes (4 or 8). (See spec + section 7.5.1) + """ + assert dwarf_format == 32 or dwarf_format == 64 + assert address_size == 8 or address_size == 4 + self.little_endian = little_endian +- self.dwarf_format = dwarf_format ++ self.dwarf_format = dwarf_format + self.address_size = address_size ++ self.dwarf_version = dwarf_version + self._create_structs() + + def initial_length_field_size(self): +@@ -131,7 +136,7 @@ + def _create_initial_length(self): + def _InitialLength(name): + # Adapts a Struct that parses forward a full initial length field. +- # Only if the first word is the continuation value, the second ++ # Only if the first word is the continuation value, the second + # word is parsed from the stream. + # + return _InitialLengthAdapter( +@@ -152,13 +157,13 @@ + self.Dwarf_uint16('version'), + self.Dwarf_offset('debug_abbrev_offset'), + self.Dwarf_uint8('address_size')) +- ++ + def _create_abbrev_declaration(self): + self.Dwarf_abbrev_declaration = Struct('Dwarf_abbrev_entry', + Enum(self.Dwarf_uleb128('tag'), **ENUM_DW_TAG), + Enum(self.Dwarf_uint8('children_flag'), **ENUM_DW_CHILDREN), + RepeatUntilExcluding( +- lambda obj, ctx: ++ lambda obj, ctx: + obj.name == 'DW_AT_null' and obj.form == 'DW_FORM_null', + Struct('attr_spec', + Enum(self.Dwarf_uleb128('name'), **ENUM_DW_AT), +@@ -167,12 +172,12 @@ + def _create_dw_form(self): + self.Dwarf_dw_form = dict( + DW_FORM_addr=self.Dwarf_target_addr(''), +- ++ + DW_FORM_block1=self._make_block_struct(self.Dwarf_uint8), + DW_FORM_block2=self._make_block_struct(self.Dwarf_uint16), + DW_FORM_block4=self._make_block_struct(self.Dwarf_uint32), + DW_FORM_block=self._make_block_struct(self.Dwarf_uleb128), +- ++ + # All DW_FORM_data forms are assumed to be unsigned + DW_FORM_data1=self.Dwarf_uint8(''), + DW_FORM_data2=self.Dwarf_uint16(''), +@@ -180,19 +185,25 @@ + DW_FORM_data8=self.Dwarf_uint64(''), + DW_FORM_sdata=self.Dwarf_sleb128(''), + DW_FORM_udata=self.Dwarf_uleb128(''), +- ++ + DW_FORM_string=CString(''), + DW_FORM_strp=self.Dwarf_offset(''), + DW_FORM_flag=self.Dwarf_uint8(''), +- ++ + DW_FORM_ref1=self.Dwarf_uint8(''), + DW_FORM_ref2=self.Dwarf_uint16(''), + DW_FORM_ref4=self.Dwarf_uint32(''), + DW_FORM_ref8=self.Dwarf_uint64(''), + DW_FORM_ref_udata=self.Dwarf_uleb128(''), + DW_FORM_ref_addr=self.Dwarf_offset(''), +- ++ + DW_FORM_indirect=self.Dwarf_uleb128(''), ++ ++ # New forms in DWARFv4 ++ DW_FORM_flag_present = StaticField('', 0), ++ DW_FORM_sec_offset = self.Dwarf_offset(''), ++ DW_FORM_exprloc = self._make_block_struct(self.Dwarf_uleb128), ++ DW_FORM_ref_sig8 = self.Dwarf_offset(''), + ) + + def _create_lineprog_header(self): +@@ -215,7 +226,7 @@ + self.Dwarf_int8('line_base'), + self.Dwarf_uint8('line_range'), + self.Dwarf_uint8('opcode_base'), +- Array(lambda ctx: ctx['opcode_base'] - 1, ++ Array(lambda ctx: ctx['opcode_base'] - 1, + self.Dwarf_uint8('standard_opcode_lengths')), + RepeatUntilExcluding( + lambda obj, ctx: obj == b'', +@@ -226,14 +237,27 @@ + ) + + def _create_callframe_entry_headers(self): +- self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', +- self.Dwarf_initial_length('length'), +- self.Dwarf_offset('CIE_id'), +- self.Dwarf_uint8('version'), +- CString('augmentation'), +- self.Dwarf_uleb128('code_alignment_factor'), +- self.Dwarf_sleb128('data_alignment_factor'), +- self.Dwarf_uleb128('return_address_register')) ++ # The CIE header was modified in DWARFv4. ++ if self.dwarf_version == 4: ++ self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', ++ self.Dwarf_initial_length('length'), ++ self.Dwarf_offset('CIE_id'), ++ self.Dwarf_uint8('version'), ++ CString('augmentation'), ++ self.Dwarf_uint8('address_size'), ++ self.Dwarf_uint8('segment_size'), ++ self.Dwarf_uleb128('code_alignment_factor'), ++ self.Dwarf_sleb128('data_alignment_factor'), ++ self.Dwarf_uleb128('return_address_register')) ++ else: ++ self.Dwarf_CIE_header = Struct('Dwarf_CIE_header', ++ self.Dwarf_initial_length('length'), ++ self.Dwarf_offset('CIE_id'), ++ self.Dwarf_uint8('version'), ++ CString('augmentation'), ++ self.Dwarf_uleb128('code_alignment_factor'), ++ self.Dwarf_sleb128('data_alignment_factor'), ++ self.Dwarf_uleb128('return_address_register')) + + self.Dwarf_FDE_header = Struct('Dwarf_FDE_header', + self.Dwarf_initial_length('length'), +@@ -242,7 +266,7 @@ + self.Dwarf_target_addr('address_range')) + + def _make_block_struct(self, length_field): +- """ Create a struct for DW_FORM_block ++ """ Create a struct for DW_FORM_block + """ + return PrefixedArray( + subcon=self.Dwarf_uint8('elem'), +diff -r 249a5ca85159 elftools/elf/constants.py +--- a/elftools/elf/constants.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/constants.py Mon Jun 03 17:52:42 2013 +0200 +@@ -45,3 +45,25 @@ + PF_MASKOS=0x00FF0000 + PF_MASKPROC=0xFF000000 + ++ ++# symbol info flags for entries ++# in the .SUNW_syminfo section ++class SUNW_SYMINFO_FLAGS(object): ++ """ Flags for the si_flags field of entries ++ in the .SUNW_syminfo section ++ """ ++ SYMINFO_FLG_DIRECT=0x1 ++ SYMINFO_FLG_FILTER=0x2 ++ SYMINFO_FLG_COPY=0x4 ++ SYMINFO_FLG_LAZYLOAD=0x8 ++ SYMINFO_FLG_DIRECTBIND=0x10 ++ SYMINFO_FLG_NOEXTDIRECT=0x20 ++ SYMINFO_FLG_AUXILIARY=0x40 ++ SYMINFO_FLG_INTERPOSE=0x80 ++ SYMINFO_FLG_CAP=0x100 ++ SYMINFO_FLG_DEFERRED=0x200 ++ ++class VER_FLAGS(object): ++ VER_FLG_BASE=0x1 ++ VER_FLG_WEAK=0x2 ++ VER_FLG_INFO=0x4 +diff -r 249a5ca85159 elftools/elf/descriptions.py +--- a/elftools/elf/descriptions.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/descriptions.py Mon Jun 03 17:52:42 2013 +0200 +@@ -9,7 +9,7 @@ + from .enums import ( + ENUM_D_TAG, ENUM_E_VERSION, ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64 + ) +-from .constants import P_FLAGS, SH_FLAGS ++from .constants import P_FLAGS, SH_FLAGS, SUNW_SYMINFO_FLAGS, VER_FLAGS + from ..common.py3compat import iteritems + + +@@ -84,6 +84,28 @@ + return _DESCR_D_TAG.get(x, _unknown) + + ++def describe_syminfo_flags(x): ++ return ''.join(_DESCR_SYMINFO_FLAGS[flag] for flag in ( ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_CAP, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_COPY, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE, ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED) if x & flag) ++ ++def describe_symbol_boundto(x): ++ return _DESCR_SYMINFO_BOUNDTO.get(x, '%3s' % x) ++ ++def describe_ver_flags(x): ++ return ' | '.join(_DESCR_VER_FLAGS[flag] for flag in ( ++ VER_FLAGS.VER_FLG_WEAK, ++ VER_FLAGS.VER_FLG_BASE, ++ VER_FLAGS.VER_FLG_INFO) if x & flag) ++ + #------------------------------------------------------------------------------- + _unknown = '' + +@@ -236,6 +258,33 @@ + SHN_COMMON='COM', + ) + ++_DESCR_SYMINFO_FLAGS = { ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT: 'D', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND: 'B', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_COPY: 'C', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_LAZYLOAD: 'L', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_NOEXTDIRECT: 'N', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_AUXILIARY: 'A', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_FILTER: 'F', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_INTERPOSE: 'I', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_CAP: 'S', ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DEFERRED: 'P', ++} ++ ++_DESCR_SYMINFO_BOUNDTO = dict( ++ SYMINFO_BT_SELF='', ++ SYMINFO_BT_PARENT='', ++ SYMINFO_BT_NONE='', ++ SYMINFO_BT_EXTERN='', ++) ++ ++_DESCR_VER_FLAGS = { ++ 0: '', ++ VER_FLAGS.VER_FLG_BASE: 'BASE', ++ VER_FLAGS.VER_FLG_WEAK: 'WEAK', ++ VER_FLAGS.VER_FLG_INFO: 'INFO', ++} ++ + _DESCR_RELOC_TYPE_i386 = dict( + (v, k) for k, v in iteritems(ENUM_RELOC_TYPE_i386)) + +diff -r 249a5ca85159 elftools/elf/dynamic.py +--- a/elftools/elf/dynamic.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/dynamic.py Mon Jun 03 17:52:42 2013 +0200 +@@ -25,7 +25,8 @@ + value of DT_SONAME (fetched from the dynamic symbol table). + """ + _HANDLED_TAGS = frozenset( +- ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME']) ++ ['DT_NEEDED', 'DT_RPATH', 'DT_RUNPATH', 'DT_SONAME', ++ 'DT_SUNW_FILTER']) + + def __init__(self, entry, elffile): + self.entry = entry +diff -r 249a5ca85159 elftools/elf/elffile.py +--- a/elftools/elf/elffile.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/elffile.py Mon Jun 03 17:52:42 2013 +0200 +@@ -12,9 +12,13 @@ + from ..construct import ConstructError + from .structs import ELFStructs + from .sections import ( +- Section, StringTableSection, SymbolTableSection, NullSection) ++ Section, StringTableSection, SymbolTableSection, ++ SUNWSyminfoTableSection, NullSection) + from .dynamic import DynamicSection, DynamicSegment + from .relocation import RelocationSection, RelocationHandler ++from .gnuversions import ( ++ GNUVerNeedSection, GNUVerDefSection, ++ GNUVerSymSection) + from .segments import Segment, InterpSegment + from .enums import ENUM_RELOC_TYPE_i386, ENUM_RELOC_TYPE_x64 + from ..dwarf.dwarfinfo import DWARFInfo, DebugSectionDescriptor, DwarfConfig +@@ -125,15 +129,15 @@ + # + debug_sections = {} + for secname in (b'.debug_info', b'.debug_abbrev', b'.debug_str', +- b'.debug_line', b'.debug_frame', b'.debug_loc', +- b'.debug_ranges'): ++ b'.debug_line', b'.debug_frame', ++ b'.debug_loc', b'.debug_ranges'): + section = self.get_section_by_name(secname) + if section is None: + debug_sections[secname] = None + else: + debug_sections[secname] = self._read_dwarf_section( +- section, +- relocate_dwarf_sections) ++ section, ++ relocate_dwarf_sections) + + return DWARFInfo( + config=DwarfConfig( +@@ -143,6 +147,8 @@ + debug_info_sec=debug_sections[b'.debug_info'], + debug_abbrev_sec=debug_sections[b'.debug_abbrev'], + debug_frame_sec=debug_sections[b'.debug_frame'], ++ # TODO(eliben): reading of eh_frame is not hooked up yet ++ eh_frame_sec=None, + debug_str_sec=debug_sections[b'.debug_str'], + debug_loc_sec=debug_sections[b'.debug_loc'], + debug_ranges_sec=debug_sections[b'.debug_ranges'], +@@ -243,6 +249,14 @@ + return NullSection(section_header, name, self.stream) + elif sectype in ('SHT_SYMTAB', 'SHT_DYNSYM'): + return self._make_symbol_table_section(section_header, name) ++ elif sectype == 'SHT_SUNW_syminfo': ++ return self._make_sunwsyminfo_table_section(section_header, name) ++ elif sectype == 'SHT_GNU_verneed': ++ return self._make_gnu_verneed_section(section_header, name) ++ elif sectype == 'SHT_GNU_verdef': ++ return self._make_gnu_verdef_section(section_header, name) ++ elif sectype == 'SHT_GNU_versym': ++ return self._make_gnu_versym_section(section_header, name) + elif sectype in ('SHT_REL', 'SHT_RELA'): + return RelocationSection( + section_header, name, self.stream, self) +@@ -261,6 +275,46 @@ + elffile=self, + stringtable=strtab_section) + ++ def _make_sunwsyminfo_table_section(self, section_header, name): ++ """ Create a SUNWSyminfoTableSection ++ """ ++ linked_strtab_index = section_header['sh_link'] ++ strtab_section = self.get_section(linked_strtab_index) ++ return SUNWSyminfoTableSection( ++ section_header, name, self.stream, ++ elffile=self, ++ symboltable=strtab_section) ++ ++ def _make_gnu_verneed_section(self, section_header, name): ++ """ Create a GNUVerNeedSection ++ """ ++ linked_strtab_index = section_header['sh_link'] ++ strtab_section = self.get_section(linked_strtab_index) ++ return GNUVerNeedSection( ++ section_header, name, self.stream, ++ elffile=self, ++ stringtable=strtab_section) ++ ++ def _make_gnu_verdef_section(self, section_header, name): ++ """ Create a GNUVerDefSection ++ """ ++ linked_strtab_index = section_header['sh_link'] ++ strtab_section = self.get_section(linked_strtab_index) ++ return GNUVerDefSection( ++ section_header, name, self.stream, ++ elffile=self, ++ stringtable=strtab_section) ++ ++ def _make_gnu_versym_section(self, section_header, name): ++ """ Create a GNUVerSymSection ++ """ ++ linked_strtab_index = section_header['sh_link'] ++ strtab_section = self.get_section(linked_strtab_index) ++ return GNUVerSymSection( ++ section_header, name, self.stream, ++ elffile=self, ++ symboltable=strtab_section) ++ + def _get_segment_header(self, n): + """ Find the header of segment #n, parse it and return the struct + """ +diff -r 249a5ca85159 elftools/elf/enums.py +--- a/elftools/elf/enums.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/enums.py Mon Jun 03 17:52:42 2013 +0200 +@@ -184,14 +184,15 @@ + SHT_NUM=19, + SHT_LOOS=0x60000000, + SHT_GNU_HASH=0x6ffffff6, +- SHT_GNU_verdef=0x6ffffffd, +- SHT_GNU_verneed=0x6ffffffe, +- SHT_GNU_versym=0x6fffffff, ++ SHT_GNU_verdef=0x6ffffffd, # also SHT_SUNW_verdef ++ SHT_GNU_verneed=0x6ffffffe, # also SHT_SUNW_verneed ++ SHT_GNU_versym=0x6fffffff, # also SHT_SUNW_versym + SHT_LOPROC=0x70000000, + SHT_HIPROC=0x7fffffff, + SHT_LOUSER=0x80000000, + SHT_HIUSER=0xffffffff, + SHT_AMD64_UNWIND=0x70000001, ++ SHT_SUNW_syminfo=0x6ffffffc, + _default_=Pass, + ) + +@@ -301,6 +302,24 @@ + DT_PREINIT_ARRAYSZ=33, + DT_NUM=34, + DT_LOOS=0x6000000d, ++ DT_SUNW_AUXILIARY=0x6000000d, ++ DT_SUNW_RTLDINF=0x6000000e, ++ DT_SUNW_FILTER=0x6000000f, ++ DT_SUNW_CAP=0x60000010, ++ DT_SUNW_SYMTAB=0x60000011, ++ DT_SUNW_SYMSZ=0x60000012, ++ DT_SUNW_ENCODING=0x60000013, ++ DT_SUNW_SORTENT=0x60000013, ++ DT_SUNW_SYMSORT=0x60000014, ++ DT_SUNW_SYMSORTSZ=0x60000015, ++ DT_SUNW_TLSSORT=0x60000016, ++ DT_SUNW_TLSSORTSZ=0x60000017, ++ DT_SUNW_CAPINFO=0x60000018, ++ DT_SUNW_STRPAD=0x60000019, ++ DT_SUNW_CAPCHAIN=0x6000001a, ++ DT_SUNW_LDMACH=0x6000001b, ++ DT_SUNW_CAPCHAINENT=0x6000001d, ++ DT_SUNW_CAPCHAINSZ=0x6000001f, + DT_HIOS=0x6ffff000, + DT_LOPROC=0x70000000, + DT_HIPROC=0x7fffffff, +@@ -428,3 +447,29 @@ + _default_=Pass, + ) + ++# Sunw Syminfo Bound To special values ++ENUM_SUNW_SYMINFO_BOUNDTO = dict( ++ SYMINFO_BT_SELF=0xffff, ++ SYMINFO_BT_PARENT=0xfffe, ++ SYMINFO_BT_NONE=0xfffd, ++ SYMINFO_BT_EXTERN=0xfffc, ++ _default_=Pass, ++) ++ ++# Versym section, version dependency index ++ENUM_VERSYM = dict( ++ VER_NDX_LOCAL=0, ++ VER_NDX_GLOBAL=1, ++ VER_NDX_LORESERVE=0xff00, ++ VER_NDX_ELIMINATE=0xff01, ++ _default_=Pass, ++) ++# Sunw Syminfo Bound To special values ++ENUM_SUNW_SYMINFO_BOUNDTO = dict( ++ SYMINFO_BT_SELF=0xffff, ++ SYMINFO_BT_PARENT=0xfffe, ++ SYMINFO_BT_NONE=0xfffd, ++ SYMINFO_BT_EXTERN=0xfffc, ++ _default_=Pass, ++) ++ +diff -r 249a5ca85159 elftools/elf/gnuversions.py +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/elftools/elf/gnuversions.py Mon Jun 03 17:52:42 2013 +0200 +@@ -0,0 +1,228 @@ ++#------------------------------------------------------------------------------ ++# elftools: elf/gnuversions.py ++# ++# ELF sections ++# ++# Yann Rouillard (yann at pleiades.fr.eu.org) ++# This code is in the public domain ++#------------------------------------------------------------------------------ ++from ..construct import CString ++from ..common.utils import struct_parse, elf_assert ++from .sections import Section, Symbol ++ ++ ++class Version(object): ++ """ Version object - representing a version definition or dependency ++ entry from a "Version Needed" or a "Version Dependency" table section. ++ ++ This kind of entry contains a pointer to an array of auxiliary entries ++ that store the information about version names or dependencies. ++ These entries are not stored in this object and should be accessed ++ through the appropriate method of a section object which will return ++ an iterator of VersionAuxiliary objects. ++ ++ Similarly to Section objects, allows dictionary-like access to ++ verdef/verneed entry ++ """ ++ def __init__(self, entry, name=None): ++ self.entry = entry ++ self.name = name ++ ++ def __getitem__(self, name): ++ """ Implement dict-like access to entry ++ """ ++ return self.entry[name] ++ ++ ++class VersionAuxiliary(object): ++ """ Version Auxiliary object - representing an auxiliary entry of a version ++ definition or dependency entry ++ ++ Similarly to Section objects, allows dictionary-like access to the ++ verdaux/vernaux entry ++ """ ++ def __init__(self, entry, name): ++ self.entry = entry ++ self.name = name ++ ++ def __getitem__(self, name): ++ """ Implement dict-like access to entries ++ """ ++ return self.entry[name] ++ ++ ++class GNUVersionSection(Section): ++ """ Common ancestor class for ELF SUNW|GNU Version Needed/Dependency ++ sections class which contains shareable code ++ """ ++ ++ def __init__(self, header, name, stream, elffile, stringtable, ++ field_prefix, version_struct, version_auxiliaries_struct): ++ super(GNUVersionSection, self).__init__(header, name, stream) ++ self.elffile = elffile ++ self.stringtable = stringtable ++ self.field_prefix = field_prefix ++ self.version_struct = version_struct ++ self.version_auxiliaries_struct = version_auxiliaries_struct ++ ++ def num_versions(self): ++ """ Number of version entries in the section ++ """ ++ return self['sh_info'] ++ ++ def _field_name(self, name, auxiliary=False): ++ """ Return the real field's name of version or a version auxiliary ++ entry ++ """ ++ middle = 'a_' if auxiliary else '_' ++ return self.field_prefix + middle + name ++ ++ def _iter_version_auxiliaries(self, entry_offset, count): ++ """ Yield all auxiliary entries of a version entry ++ """ ++ name_field = self._field_name('name', auxiliary=True) ++ next_field = self._field_name('next', auxiliary=True) ++ ++ for _ in range(count): ++ entry = struct_parse( ++ self.version_auxiliaries_struct, ++ self.stream, ++ stream_pos=entry_offset) ++ ++ name = self.stringtable.get_string(entry[name_field]) ++ version_aux = VersionAuxiliary(entry, name) ++ yield version_aux ++ ++ entry_offset += entry[next_field] ++ ++ def iter_versions(self): ++ """ Yield all the version entries in the section ++ Each time it returns the main version structure ++ and an iterator to walk through its auxiliaries entries ++ """ ++ aux_field = self._field_name('aux') ++ count_field = self._field_name('cnt') ++ next_field = self._field_name('next') ++ ++ entry_offset = self['sh_offset'] ++ for _ in range(self.num_versions()): ++ entry = struct_parse( ++ self.version_struct, ++ self.stream, ++ stream_pos=entry_offset) ++ ++ elf_assert(entry[count_field] > 0, ++ 'Expected number of version auxiliary entries (%s) to be > 0' ++ 'for the following version entry: %s' % ( ++ count_field, str(entry))) ++ ++ version = Version(entry) ++ aux_entries_offset = entry_offset + entry[aux_field] ++ version_auxiliaries_iter = self._iter_version_auxiliaries( ++ aux_entries_offset, entry[count_field]) ++ ++ yield version, version_auxiliaries_iter ++ ++ entry_offset += entry[next_field] ++ ++ ++class GNUVerNeedSection(GNUVersionSection): ++ """ ELF SUNW or GNU Version Needed table section. ++ Has an associated StringTableSection that's passed in the constructor. ++ """ ++ def __init__(self, header, name, stream, elffile, stringtable): ++ super(GNUVerNeedSection, self).__init__( ++ header, name, stream, elffile, stringtable, 'vn', ++ elffile.structs.Elf_Verneed, elffile.structs.Elf_Vernaux) ++ self._has_indexes = None ++ ++ def has_indexes(self): ++ """ Return True if at least one version definition entry has an index ++ that is stored in the vna_other field. ++ This information is used for symbol versioning ++ """ ++ if self._has_indexes is None: ++ self._has_indexes = False ++ for _, vernaux_iter in self.iter_versions(): ++ for vernaux in vernaux_iter: ++ if vernaux['vna_other']: ++ self._has_indexes = True ++ break ++ ++ return self._has_indexes ++ ++ def iter_versions(self): ++ for verneed, vernaux in super(GNUVerNeedSection, self).iter_versions(): ++ verneed.name = self.stringtable.get_string(verneed['vn_file']) ++ yield verneed, vernaux ++ ++ def get_version(self, index): ++ """ Get the version information located at index #n in the table ++ Return boths the verneed structure and the vernaux structure ++ that contains the name of the version ++ """ ++ for verneed, vernaux_iter in self.iter_versions(): ++ for vernaux in vernaux_iter: ++ if vernaux['vna_other'] == index: ++ return verneed, vernaux ++ ++ return None ++ ++ ++class GNUVerDefSection(GNUVersionSection): ++ """ ELF SUNW or GNU Version Definition table section. ++ Has an associated StringTableSection that's passed in the constructor. ++ """ ++ def __init__(self, header, name, stream, elffile, stringtable): ++ super(GNUVerDefSection, self).__init__( ++ header, name, stream, elffile, stringtable, 'vd', ++ elffile.structs.Elf_Verdef, elffile.structs.Elf_Verdaux) ++ ++ def get_version(self, index): ++ """ Get the version information located at index #n in the table ++ Return boths the verdef structure and an iterator to retrieve ++ both the version names and dependencies in the form of ++ verdaux entries ++ """ ++ for verdef, verdaux_iter in self.iter_versions(): ++ if verdef['vd_ndx'] == index: ++ return verdef, verdaux_iter ++ ++ return None ++ ++ ++class GNUVerSymSection(Section): ++ """ ELF SUNW or GNU Versym table section. ++ Has an associated SymbolTableSection that's passed in the constructor. ++ """ ++ def __init__(self, header, name, stream, elffile, symboltable): ++ super(GNUVerSymSection, self).__init__(header, name, stream) ++ self.elffile = elffile ++ self.elfstructs = self.elffile.structs ++ self.symboltable = symboltable ++ ++ def num_symbols(self): ++ """ Number of symbols in the table ++ """ ++ return self['sh_size'] // self['sh_entsize'] ++ ++ def get_symbol(self, n): ++ """ Get the symbol at index #n from the table (Symbol object) ++ It begins at 1 and not 0 since the first entry is used to ++ store the current version of the syminfo table ++ """ ++ # Grab the symbol's entry from the stream ++ entry_offset = self['sh_offset'] + n * self['sh_entsize'] ++ entry = struct_parse( ++ self.elfstructs.Elf_Versym, ++ self.stream, ++ stream_pos=entry_offset) ++ # Find the symbol name in the associated symbol table ++ name = self.symboltable.get_symbol(n).name ++ return Symbol(entry, name) ++ ++ def iter_symbols(self): ++ """ Yield all the symbols in the table ++ """ ++ for i in range(self.num_symbols()): ++ yield self.get_symbol(i) +diff -r 249a5ca85159 elftools/elf/relocation.py +--- a/elftools/elf/relocation.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/relocation.py Mon Jun 03 17:52:42 2013 +0200 +@@ -202,6 +202,9 @@ + def _reloc_calc_sym_plus_addend(value, sym_value, offset, addend=0): + return sym_value + addend + ++ def _reloc_calc_sym_plus_addend_pcrel(value, sym_value, offset, addend=0): ++ return sym_value + addend - offset ++ + _RELOCATION_RECIPES_X86 = { + ENUM_RELOC_TYPE_i386['R_386_NONE']: _RELOCATION_RECIPE_TYPE( + bytesize=4, has_addend=False, calc_func=_reloc_calc_identity), +@@ -218,6 +221,9 @@ + bytesize=8, has_addend=True, calc_func=_reloc_calc_identity), + ENUM_RELOC_TYPE_x64['R_X86_64_64']: _RELOCATION_RECIPE_TYPE( + bytesize=8, has_addend=True, calc_func=_reloc_calc_sym_plus_addend), ++ ENUM_RELOC_TYPE_x64['R_X86_64_PC32']: _RELOCATION_RECIPE_TYPE( ++ bytesize=8, has_addend=True, ++ calc_func=_reloc_calc_sym_plus_addend_pcrel), + ENUM_RELOC_TYPE_x64['R_X86_64_32']: _RELOCATION_RECIPE_TYPE( + bytesize=4, has_addend=True, calc_func=_reloc_calc_sym_plus_addend), + ENUM_RELOC_TYPE_x64['R_X86_64_32S']: _RELOCATION_RECIPE_TYPE( +diff -r 249a5ca85159 elftools/elf/sections.py +--- a/elftools/elf/sections.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/sections.py Mon Jun 03 17:52:42 2013 +0200 +@@ -13,7 +13,7 @@ + class Section(object): + """ Base class for ELF sections. Also used for all sections types that have + no special functionality. +- ++ + Allows dictionary-like access to the section header. For example: + > sec = Section(...) + > sec['sh_type'] # section type +@@ -22,7 +22,7 @@ + self.header = header + self.name = name + self.stream = stream +- ++ + def data(self): + """ The section data from the file. + """ +@@ -33,7 +33,7 @@ + """ Is this a null section? + """ + return False +- ++ + def __getitem__(self, name): + """ Implement dict-like access to header entries + """ +@@ -51,14 +51,14 @@ + + def is_null(self): + return True +- ++ + + class StringTableSection(Section): + """ ELF string table section. + """ + def __init__(self, header, name, stream): + super(StringTableSection, self).__init__(header, name, stream) +- ++ + def get_string(self, offset): + """ Get the string stored at the given offset in this string table. + """ +@@ -85,7 +85,7 @@ + """ Number of symbols in the table + """ + return self['sh_size'] // self['sh_entsize'] +- ++ + def get_symbol(self, n): + """ Get the symbol at index #n from the table (Symbol object) + """ +@@ -123,3 +123,38 @@ + return self.entry[name] + + ++class SUNWSyminfoTableSection(Section): ++ """ ELF .SUNW Syminfo table section. ++ Has an associated SymbolTableSection that's passed in the constructor. ++ """ ++ def __init__(self, header, name, stream, elffile, symboltable): ++ super(SUNWSyminfoTableSection, self).__init__(header, name, stream) ++ self.elffile = elffile ++ self.elfstructs = self.elffile.structs ++ self.symboltable = symboltable ++ ++ def num_symbols(self): ++ """ Number of symbols in the table ++ """ ++ return self['sh_size'] // self['sh_entsize'] - 1 ++ ++ def get_symbol(self, n): ++ """ Get the symbol at index #n from the table (Symbol object). ++ It begins at 1 and not 0 since the first entry is used to ++ store the current version of the syminfo table. ++ """ ++ # Grab the symbol's entry from the stream ++ entry_offset = self['sh_offset'] + n * self['sh_entsize'] ++ entry = struct_parse( ++ self.elfstructs.Elf_Sunw_Syminfo, ++ self.stream, ++ stream_pos=entry_offset) ++ # Find the symbol name in the associated symbol table ++ name = self.symboltable.get_symbol(n).name ++ return Symbol(entry, name) ++ ++ def iter_symbols(self): ++ """ Yield all the symbols in the table ++ """ ++ for i in range(1, self.num_symbols() + 1): ++ yield self.get_symbol(i) +diff -r 249a5ca85159 elftools/elf/structs.py +--- a/elftools/elf/structs.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/elftools/elf/structs.py Mon Jun 03 17:52:42 2013 +0200 +@@ -19,20 +19,20 @@ + + class ELFStructs(object): + """ Accessible attributes: +- ++ + Elf_{byte|half|word|word64|addr|offset|sword|xword|xsword}: +- Data chunks, as specified by the ELF standard, adjusted for ++ Data chunks, as specified by the ELF standard, adjusted for + correct endianness and word-size. + + Elf_Ehdr: + ELF file header +- ++ + Elf_Phdr: + Program header +- ++ + Elf_Shdr: + Section header +- ++ + Elf_Sym: + Symbol table entry + +@@ -42,9 +42,9 @@ + def __init__(self, little_endian=True, elfclass=32): + assert elfclass == 32 or elfclass == 64 + self.little_endian = little_endian +- self.elfclass = elfclass ++ self.elfclass = elfclass + self._create_structs() +- ++ + def _create_structs(self): + if self.little_endian: + self.Elf_byte = ULInt8 +@@ -66,14 +66,18 @@ + self.Elf_sword = SBInt32 + self.Elf_xword = UBInt32 if self.elfclass == 32 else UBInt64 + self.Elf_sxword = SBInt32 if self.elfclass == 32 else SBInt64 +- ++ + self._create_ehdr() + self._create_phdr() + self._create_shdr() + self._create_sym() + self._create_rel() + self._create_dyn() +- ++ self._create_sunw_syminfo() ++ self._create_gnu_verneed() ++ self._create_gnu_verdef() ++ self._create_gnu_versym() ++ + def _create_ehdr(self): + self.Elf_Ehdr = Struct('Elf_Ehdr', + Struct('e_ident', +@@ -99,7 +103,7 @@ + self.Elf_half('e_shnum'), + self.Elf_half('e_shstrndx'), + ) +- ++ + def _create_phdr(self): + if self.elfclass == 32: + self.Elf_Phdr = Struct('Elf_Phdr', +@@ -122,8 +126,8 @@ + self.Elf_xword('p_filesz'), + self.Elf_xword('p_memsz'), + self.Elf_xword('p_align'), +- ) +- ++ ) ++ + def _create_shdr(self): + self.Elf_Shdr = Struct('Elf_Shdr', + self.Elf_word('sh_name'), +@@ -137,7 +141,7 @@ + self.Elf_xword('sh_addralign'), + self.Elf_xword('sh_entsize'), + ) +- ++ + def _create_rel(self): + # r_info is also taken apart into r_info_sym and r_info_type. + # This is done in Value to avoid endianity issues while parsing. +@@ -203,5 +207,50 @@ + self.Elf_xword('st_size'), + ) + ++ def _create_sunw_syminfo(self): ++ self.Elf_Sunw_Syminfo = Struct('Elf_Sunw_Syminfo', ++ Enum(self.Elf_half('si_boundto'), **ENUM_SUNW_SYMINFO_BOUNDTO), ++ self.Elf_half('si_flags'), ++ ) + ++ def _create_gnu_verneed(self): ++ # Structure of "version needed" entries is documented in ++ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format ++ self.Elf_Verneed = Struct('Elf_Verneed', ++ self.Elf_half('vn_version'), ++ self.Elf_half('vn_cnt'), ++ self.Elf_word('vn_file'), ++ self.Elf_word('vn_aux'), ++ self.Elf_word('vn_next'), ++ ) ++ self.Elf_Vernaux = Struct('Elf_Vernaux', ++ self.Elf_word('vna_hash'), ++ self.Elf_half('vna_flags'), ++ self.Elf_half('vna_other'), ++ self.Elf_word('vna_name'), ++ self.Elf_word('vna_next'), ++ ) + ++ def _create_gnu_verdef(self): ++ # Structure off "version definition" entries are documented in ++ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format ++ self.Elf_Verdef = Struct('Elf_Verdef', ++ self.Elf_half('vd_version'), ++ self.Elf_half('vd_flags'), ++ self.Elf_half('vd_ndx'), ++ self.Elf_half('vd_cnt'), ++ self.Elf_word('vd_hash'), ++ self.Elf_word('vd_aux'), ++ self.Elf_word('vd_next'), ++ ) ++ self.Elf_Verdaux = Struct('Elf_Verdaux', ++ self.Elf_word('vda_name'), ++ self.Elf_word('vda_next'), ++ ) ++ ++ def _create_gnu_versym(self): ++ # Structure off "version symbol" entries are documented in ++ # Oracle "Linker and Libraries Guide", Chapter 7 Object File Format ++ self.Elf_Versym = Struct('Elf_Versym', ++ Enum(self.Elf_half('ndx'), **ENUM_VERSYM), ++ ) +diff -r 249a5ca85159 scripts/readelf.py +--- a/scripts/readelf.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/scripts/readelf.py Mon Jun 03 17:52:42 2013 +0200 +@@ -25,6 +25,10 @@ + from elftools.elf.enums import ENUM_D_TAG + from elftools.elf.segments import InterpSegment + from elftools.elf.sections import SymbolTableSection ++from elftools.elf.gnuversions import ( ++ GNUVerSymSection, GNUVerDefSection, ++ GNUVerNeedSection, ++ ) + from elftools.elf.relocation import RelocationSection + from elftools.elf.descriptions import ( + describe_ei_class, describe_ei_data, describe_ei_version, +@@ -33,6 +37,7 @@ + describe_sh_type, describe_sh_flags, + describe_symbol_type, describe_symbol_bind, describe_symbol_visibility, + describe_symbol_shndx, describe_reloc_type, describe_dyn_tag, ++ describe_ver_flags, + ) + from elftools.dwarf.dwarfinfo import DWARFInfo + from elftools.dwarf.descriptions import ( +@@ -61,6 +66,8 @@ + # Lazily initialized if a debug dump is requested + self._dwarfinfo = None + ++ self._versioninfo = None ++ + def display_file_header(self): + """ Display the ELF file header + """ +@@ -254,6 +261,8 @@ + def display_symbol_tables(self): + """ Display the symbol tables contained in the file + """ ++ self._init_versioninfo() ++ + for section in self.elffile.iter_sections(): + if not isinstance(section, SymbolTableSection): + continue +@@ -272,16 +281,37 @@ + self._emitline(' Num: Value Size Type Bind Vis Ndx Name') + + for nsym, symbol in enumerate(section.iter_symbols()): ++ ++ version_info = '' ++ # readelf doesn't display version info for Solaris versioning ++ if (section['sh_type'] == 'SHT_DYNSYM' and ++ self._versioninfo['type'] == 'GNU'): ++ version = self._symbol_version(nsym) ++ if (version['name'] != bytes2str(symbol.name) and ++ version['index'] not in ('VER_NDX_LOCAL', ++ 'VER_NDX_GLOBAL')): ++ if version['filename']: ++ # external symbol ++ version_info = '@%(name)s (%(index)i)' % version ++ else: ++ # internal symbol ++ if version['hidden']: ++ version_info = '@%(name)s' % version ++ else: ++ version_info = '@@%(name)s' % version ++ + # symbol names are truncated to 25 chars, similarly to readelf +- self._emitline('%6d: %s %5d %-7s %-6s %-7s %4s %.25s' % ( ++ self._emitline('%6d: %s %5d %-7s %-6s %-7s %4s %.25s%s' % ( + nsym, +- self._format_hex(symbol['st_value'], fullhex=True, lead0x=False), ++ self._format_hex( ++ symbol['st_value'], fullhex=True, lead0x=False), + symbol['st_size'], + describe_symbol_type(symbol['st_info']['type']), + describe_symbol_bind(symbol['st_info']['bind']), + describe_symbol_visibility(symbol['st_other']['visibility']), + describe_symbol_shndx(symbol['st_shndx']), +- bytes2str(symbol.name))) ++ bytes2str(symbol.name), ++ version_info)) + + def display_dynamic_tags(self): + """ Display the dynamic tags contained in the file +@@ -384,6 +414,111 @@ + if not has_relocation_sections: + self._emitline('\nThere are no relocations in this file.') + ++ def display_version_info(self): ++ """ Display the version info contained in the file ++ """ ++ self._init_versioninfo() ++ ++ if not self._versioninfo['type']: ++ self._emitline("\nNo version information found in this file.") ++ return ++ ++ for section in self.elffile.iter_sections(): ++ if isinstance(section, GNUVerSymSection): ++ self._print_version_section_header( ++ section, 'Version symbols', lead0x=False) ++ ++ num_symbols = section.num_symbols() ++ ++ # Symbol version info are printed four by four entries ++ for idx_by_4 in range(0, num_symbols, 4): ++ ++ self._emit(' %03x:' % idx_by_4) ++ ++ for idx in range(idx_by_4, min(idx_by_4 + 4, num_symbols)): ++ ++ symbol_version = self._symbol_version(idx) ++ if symbol_version['index'] == 'VER_NDX_LOCAL': ++ version_index = 0 ++ version_name = '(*local*)' ++ elif symbol_version['index'] == 'VER_NDX_GLOBAL': ++ version_index = 1 ++ version_name = '(*global*)' ++ else: ++ version_index = symbol_version['index'] ++ version_name = '(%(name)s)' % symbol_version ++ ++ visibility = 'h' if symbol_version['hidden'] else ' ' ++ ++ self._emit('%4x%s%-13s' % ( ++ version_index, visibility, version_name)) ++ ++ self._emitline() ++ ++ elif isinstance(section, GNUVerDefSection): ++ self._print_version_section_header( ++ section, 'Version definition', indent=2) ++ ++ offset = 0 ++ for verdef, verdaux_iter in section.iter_versions(): ++ verdaux = next(verdaux_iter) ++ ++ name = verdaux.name ++ if verdef['vd_flags']: ++ flags = describe_ver_flags(verdef['vd_flags']) ++ # Mimic exactly the readelf output ++ flags += ' ' ++ else: ++ flags = 'none' ++ ++ self._emitline(' %s: Rev: %i Flags: %s Index: %i' ++ ' Cnt: %i Name: %s' % ( ++ self._format_hex(offset, fieldsize=6, ++ alternate=True), ++ verdef['vd_version'], flags, verdef['vd_ndx'], ++ verdef['vd_cnt'], bytes2str(name))) ++ ++ verdaux_offset = ( ++ offset + verdef['vd_aux'] + verdaux['vda_next']) ++ for idx, verdaux in enumerate(verdaux_iter, start=1): ++ self._emitline(' %s: Parent %i: %s' % ++ (self._format_hex(verdaux_offset, fieldsize=4), ++ idx, bytes2str(verdaux.name))) ++ verdaux_offset += verdaux['vda_next'] ++ ++ offset += verdef['vd_next'] ++ ++ elif isinstance(section, GNUVerNeedSection): ++ self._print_version_section_header(section, 'Version needs') ++ ++ offset = 0 ++ for verneed, verneed_iter in section.iter_versions(): ++ ++ self._emitline(' %s: Version: %i File: %s Cnt: %i' % ( ++ self._format_hex(offset, fieldsize=6, ++ alternate=True), ++ verneed['vn_version'], bytes2str(verneed.name), ++ verneed['vn_cnt'])) ++ ++ vernaux_offset = offset + verneed['vn_aux'] ++ for idx, vernaux in enumerate(verneed_iter, start=1): ++ if vernaux['vna_flags']: ++ flags = describe_ver_flags(vernaux['vna_flags']) ++ # Mimic exactly the readelf output ++ flags += ' ' ++ else: ++ flags = 'none' ++ ++ self._emitline( ++ ' %s: Name: %s Flags: %s Version: %i' % ( ++ self._format_hex(vernaux_offset, fieldsize=4), ++ bytes2str(vernaux.name), flags, ++ vernaux['vna_other'])) ++ ++ vernaux_offset += vernaux['vna_next'] ++ ++ offset += verneed['vn_next'] ++ + def display_hex_dump(self, section_spec): + """ Display a hex dump of a section. section_spec is either a section + number or a name. +@@ -486,7 +621,8 @@ + else: + self._emitline('debug dump not yet supported for "%s"' % dump_what) + +- def _format_hex(self, addr, fieldsize=None, fullhex=False, lead0x=True): ++ def _format_hex(self, addr, fieldsize=None, fullhex=False, lead0x=True, ++ alternate=False): + """ Format an address into a hexadecimal string. + + fieldsize: +@@ -501,7 +637,20 @@ + + lead0x: + If True, leading 0x is added ++ ++ alternate: ++ If True, override lead0x to emulate the alternate ++ hexadecimal form specified in format string with the # ++ character: only non-zero values are prefixed with 0x. ++ This form is used by readelf. + """ ++ if alternate: ++ if addr == 0: ++ lead0x = False ++ else: ++ lead0x = True ++ fieldsize -= 2 ++ + s = '0x' if lead0x else '' + if fullhex: + fieldsize = 8 if self.elffile.elfclass == 32 else 16 +@@ -511,6 +660,97 @@ + field = '%' + '0%sx' % fieldsize + return s + field % addr + ++ def _print_version_section_header(self, version_section, name, lead0x=True, ++ indent=1): ++ """ Print a section header of one version related section (versym, ++ verneed or verdef) with some options to accomodate readelf ++ little differences between each header (e.g. indentation ++ and 0x prefixing). ++ """ ++ if hasattr(version_section, 'num_versions'): ++ num_entries = version_section.num_versions() ++ else: ++ num_entries = version_section.num_symbols() ++ ++ self._emitline("\n%s section '%s' contains %s entries:" % ++ (name, bytes2str(version_section.name), num_entries)) ++ self._emitline('%sAddr: %s Offset: %s Link: %i (%s)' % ( ++ ' ' * indent, ++ self._format_hex( ++ version_section['sh_addr'], fieldsize=16, lead0x=lead0x), ++ self._format_hex( ++ version_section['sh_offset'], fieldsize=6, lead0x=True), ++ version_section['sh_link'], ++ bytes2str( ++ self.elffile.get_section(version_section['sh_link']).name) ++ ) ++ ) ++ ++ def _init_versioninfo(self): ++ """ Search and initialize informations about version related sections ++ and the kind of versioning used (GNU or Solaris). ++ """ ++ if self._versioninfo is not None: ++ return ++ ++ self._versioninfo = {'versym': None, 'verdef': None, ++ 'verneed': None, 'type': None} ++ ++ for section in self.elffile.iter_sections(): ++ if isinstance(section, GNUVerSymSection): ++ self._versioninfo['versym'] = section ++ elif isinstance(section, GNUVerDefSection): ++ self._versioninfo['verdef'] = section ++ elif isinstance(section, GNUVerNeedSection): ++ self._versioninfo['verneed'] = section ++ elif isinstance(section, DynamicSection): ++ for tag in section.iter_tags(): ++ if tag['d_tag'] == 'DT_VERSYM': ++ self._versioninfo['type'] = 'GNU' ++ break ++ ++ if not self._versioninfo['type'] and ( ++ self._versioninfo['verneed'] or self._versioninfo['verdef']): ++ self._versioninfo['type'] = 'Solaris' ++ ++ def _symbol_version(self, nsym): ++ """ Return a dict containing information on the ++ or None if no version information is available ++ """ ++ self._init_versioninfo() ++ ++ symbol_version = dict.fromkeys(('index', 'name', 'filename', 'hidden')) ++ ++ if (not self._versioninfo['versym'] or ++ nsym >= self._versioninfo['versym'].num_symbols()): ++ return None ++ ++ symbol = self._versioninfo['versym'].get_symbol(nsym) ++ index = symbol.entry['ndx'] ++ if not index in ('VER_NDX_LOCAL', 'VER_NDX_GLOBAL'): ++ index = int(index) ++ ++ if self._versioninfo['type'] == 'GNU': ++ # In GNU versioning mode, the highest bit is used to ++ # store wether the symbol is hidden or not ++ if index & 0x8000: ++ index &= ~0x8000 ++ symbol_version['hidden'] = True ++ ++ if (self._versioninfo['verdef'] and ++ index <= self._versioninfo['verdef'].num_versions()): ++ _, verdaux_iter = \ ++ self._versioninfo['verdef'].get_version(index) ++ symbol_version['name'] = bytes2str(next(verdaux_iter).name) ++ else: ++ verneed, vernaux = \ ++ self._versioninfo['verneed'].get_version(index) ++ symbol_version['name'] = bytes2str(vernaux.name) ++ symbol_version['filename'] = bytes2str(verneed.name) ++ ++ symbol_version['index'] = index ++ return symbol_version ++ + def _section_from_spec(self, spec): + """ Retrieve a section given a "spec" (either number or name). + Return None if no such section exists in the file. +@@ -802,6 +1042,9 @@ + optparser.add_option('-p', '--string-dump', + action='store', dest='show_string_dump', metavar='', + help='Dump the contents of section as strings') ++ optparser.add_option('-V', '--version-info', ++ action='store_true', dest='show_version_info', ++ help='Display the version sections (if present)') + optparser.add_option('--debug-dump', + action='store', dest='debug_dump_what', metavar='', + help=( +@@ -838,6 +1081,8 @@ + readelf.display_symbol_tables() + if options.show_relocs: + readelf.display_relocations() ++ if options.show_version_info: ++ readelf.display_version_info() + if options.show_hex_dump: + readelf.display_hex_dump(options.show_hex_dump) + if options.show_string_dump: +diff -r 249a5ca85159 setup.py +--- a/setup.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/setup.py Mon Jun 03 17:52:42 2013 +0200 +@@ -44,7 +44,7 @@ + 'elftools.construct', 'elftools.construct.lib', + ], + +- scripts=['scripts/readelf.py'], ++ scripts=['scripts/readelf.py'] + ) + + +diff -r 249a5ca85159 test/run_readelf_tests.py +--- a/test/run_readelf_tests.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/test/run_readelf_tests.py Mon Jun 03 17:52:42 2013 +0200 +@@ -50,7 +50,7 @@ + success = True + testlog.info("Test file '%s'" % filename) + for option in [ +- '-e', '-d', '-s', '-r', '-x.text', '-p.shstrtab', ++ '-e', '-d', '-s', '-r', '-x.text', '-p.shstrtab', '-V', + '--debug-dump=info', '--debug-dump=decodedline', + '--debug-dump=frames', '--debug-dump=frames-interp']: + if verbose: testlog.info("..option='%s'" % option) +@@ -90,9 +90,9 @@ + Note: this function contains some rather horrible hacks to ignore + differences which are not important for the verification of pyelftools. + This is due to some intricacies of binutils's readelf which pyelftools +- doesn't currently implement, or silly inconsistencies in the output of +- readelf, which I was reluctant to replicate. +- Read the documentation for more details. ++ doesn't currently implement, features that binutils doesn't support, ++ or silly inconsistencies in the output of readelf, which I was reluctant ++ to replicate. Read the documentation for more details. + """ + def prepare_lines(s): + return [line for line in s.lower().splitlines() if line.strip() != ''] +@@ -146,6 +146,9 @@ + elif 'os/abi' in lines1[i]: + if 'unix - gnu' in lines1[i] and 'unix - linux' in lines2[i]: + ok = True ++ elif ( 'unknown at value' in lines1[i] and ++ 'dw_at_apple' in lines2[i]): ++ ok = True + else: + for s in ('t (tls)', 'l (large)'): + if s in lines1[i] or s in lines2[i]: +@@ -183,7 +186,7 @@ + if len(args) > 0: + filenames = args + else: +- filenames = list(discover_testfiles('test/testfiles')) ++ filenames = list(discover_testfiles('test/testfiles_for_readelf')) + + success = True + for filename in filenames: +diff -r 249a5ca85159 test/test_arm_support.py +--- a/test/test_arm_support.py Wed Apr 17 05:57:58 2013 -0700 ++++ b/test/test_arm_support.py Mon Jun 03 17:52:42 2013 +0200 +@@ -15,7 +15,7 @@ + + class TestARMSupport(unittest.TestCase): + def test_hello(self): +- with open(os.path.join('test', 'testfiles', ++ with open(os.path.join('test', 'testfiles_for_unittests', + 'simple_gcc.elf.arm'), 'rb') as f: + elf = ELFFile(f) + self.assertEqual(elf.get_machine_arch(), 'ARM') +diff -r 249a5ca85159 test/test_gnuversions.py +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/test/test_gnuversions.py Mon Jun 03 17:52:42 2013 +0200 +@@ -0,0 +1,160 @@ ++#------------------------------------------------------------------------------ ++# elftools tests ++# ++# Yann Rouillard (yann at pleiades.fr.eu.org) ++# This code is in the public domain ++#------------------------------------------------------------------------------ ++try: ++ import unittest2 as unittest ++except ImportError: ++ import unittest ++import os ++ ++from utils import setup_syspath ++setup_syspath() ++from elftools.elf.elffile import ELFFile ++from elftools.elf.constants import VER_FLAGS ++from elftools.elf.gnuversions import ( ++ GNUVerNeedSection, GNUVerDefSection, ++ GNUVerSymSection) ++ ++ ++class TestSymbolVersioning(unittest.TestCase): ++ ++ versym_reference_data = [ ++ {'name': b'', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'_ITM_deregisterTMCloneTable', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'puts', 'ndx': 5}, ++ {'name': b'strlcat', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'__stack_chk_fail', 'ndx': 6}, ++ {'name': b'__gmon_start__', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'gzoffset', 'ndx': 7}, ++ {'name': b'_Jv_RegisterClasses', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'_ITM_registerTMCloneTable', 'ndx': 'VER_NDX_LOCAL'}, ++ {'name': b'__cxa_finalize', 'ndx': 5}, ++ {'name': b'_edata', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'VER_1.0', 'ndx': 2}, ++ {'name': b'function1_ver1_1', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'_end', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'function1', 'ndx': 4 | 0x8000}, ++ {'name': b'__bss_start', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'function1', 'ndx': 2}, ++ {'name': b'VER_1.1', 'ndx': 3}, ++ {'name': b'_init', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'function1_ver1_0', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'_fini', 'ndx': 'VER_NDX_GLOBAL'}, ++ {'name': b'VER_1.2', 'ndx': 4}, ++ {'name': b'function2', 'ndx': 3}, ++ ] ++ ++ def test_versym_section(self): ++ ++ reference_data = TestSymbolVersioning.versym_reference_data ++ ++ with open(os.path.join('test', 'testfiles_for_unittests', ++ 'lib_versioned64.so.1.elf'), 'rb') as f: ++ elf = ELFFile(f) ++ versym_section = None ++ for section in elf.iter_sections(): ++ if isinstance(section, GNUVerSymSection): ++ versym_section = section ++ break ++ ++ self.assertIsNotNone(versym_section) ++ ++ for versym, ref_versym in zip(section.iter_symbols(), ++ reference_data): ++ self.assertEqual(versym.name, ref_versym['name']) ++ self.assertEqual(versym['ndx'], ref_versym['ndx']) ++ ++ verneed_reference_data = [ ++ {'name': b'libz.so.1', 'vn_version': 1, 'vn_cnt': 1, ++ 'vernaux': [ ++ {'name': b'ZLIB_1.2.3.5', 'vna_flags': 0, 'vna_other': 7}]}, ++ {'name': b'libc.so.6', 'vn_version': 1, 'vn_cnt': 2, ++ 'vernaux': [ ++ {'name': b'GLIBC_2.4', 'vna_flags': 0, 'vna_other': 6}, ++ {'name': b'GLIBC_2.2.5', 'vna_flags': 0, 'vna_other': 5}]}, ++ ] ++ ++ def test_verneed_section(self): ++ ++ reference_data = TestSymbolVersioning.verneed_reference_data ++ ++ with open(os.path.join('test', 'testfiles_for_unittests', ++ 'lib_versioned64.so.1.elf'), 'rb') as f: ++ elf = ELFFile(f) ++ verneed_section = None ++ for section in elf.iter_sections(): ++ if isinstance(section, GNUVerNeedSection): ++ verneed_section = section ++ break ++ ++ self.assertIsNotNone(verneed_section) ++ ++ for (verneed, vernaux_iter), ref_verneed in zip( ++ section.iter_versions(), reference_data): ++ ++ self.assertEqual(verneed.name, ref_verneed['name']) ++ self.assertEqual(verneed['vn_cnt'], ref_verneed['vn_cnt']) ++ self.assertEqual(verneed['vn_version'], ++ ref_verneed['vn_version']) ++ ++ for vernaux, ref_vernaux in zip( ++ vernaux_iter, ref_verneed['vernaux']): ++ ++ self.assertEqual(vernaux.name, ref_vernaux['name']) ++ self.assertEqual(vernaux['vna_flags'], ++ ref_vernaux['vna_flags']) ++ self.assertEqual(vernaux['vna_other'], ++ ref_vernaux['vna_other']) ++ ++ verdef_reference_data = [ ++ {'vd_ndx': 1, 'vd_version': 1, 'vd_flags': VER_FLAGS.VER_FLG_BASE, ++ 'vd_cnt': 1, ++ 'verdaux': [ ++ {'name': b'lib_versioned.so.1'}]}, ++ {'vd_ndx': 2, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 1, ++ 'verdaux': [ ++ {'name': b'VER_1.0'}]}, ++ {'vd_ndx': 3, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 2, ++ 'verdaux': [ ++ {'name': b'VER_1.1'}, ++ {'name': b'VER_1.0'}]}, ++ {'vd_ndx': 4, 'vd_version': 1, 'vd_flags': 0, 'vd_cnt': 2, ++ 'verdaux': [ ++ {'name': b'VER_1.2'}, ++ {'name': b'VER_1.1'}]}, ++ ] ++ ++ def test_verdef_section(self): ++ ++ reference_data = TestSymbolVersioning.verdef_reference_data ++ ++ with open(os.path.join('test', 'testfiles_for_unittests', ++ 'lib_versioned64.so.1.elf'), 'rb') as f: ++ elf = ELFFile(f) ++ verneed_section = None ++ for section in elf.iter_sections(): ++ if isinstance(section, GNUVerDefSection): ++ verdef_section = section ++ break ++ ++ self.assertIsNotNone(verdef_section) ++ ++ for (verdef, verdaux_iter), ref_verdef in zip( ++ section.iter_versions(), reference_data): ++ ++ self.assertEqual(verdef['vd_ndx'], ref_verdef['vd_ndx']) ++ self.assertEqual(verdef['vd_version'], ++ ref_verdef['vd_version']) ++ self.assertEqual(verdef['vd_flags'], ref_verdef['vd_flags']) ++ self.assertEqual(verdef['vd_cnt'], ref_verdef['vd_cnt']) ++ ++ for verdaux, ref_verdaux in zip( ++ verdaux_iter, ref_verdef['verdaux']): ++ self.assertEqual(verdaux.name, ref_verdaux['name']) ++ ++if __name__ == '__main__': ++ unittest.main() +diff -r 249a5ca85159 test/test_solaris_support.py +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/test/test_solaris_support.py Mon Jun 03 17:52:42 2013 +0200 +@@ -0,0 +1,56 @@ ++#------------------------------------------------------------------------------- ++# elftools tests ++# ++# Yann Rouillard (yann at pleiades.fr.eu.org) ++# This code is in the public domain ++#------------------------------------------------------------------------------- ++try: ++ import unittest2 as unittest ++except ImportError: ++ import unittest ++import os ++ ++from utils import setup_syspath; setup_syspath() ++from elftools.elf.elffile import ELFFile ++from elftools.elf.constants import SUNW_SYMINFO_FLAGS ++ ++ ++class TestSolarisSupport(unittest.TestCase): ++ ++ def _test_SUNW_syminfo_section_generic(self, testfile): ++ with open(os.path.join('test', 'testfiles_for_unittests', ++ testfile), 'rb') as f: ++ elf = ELFFile(f) ++ syminfo_section = elf.get_section_by_name(b'.SUNW_syminfo') ++ self.assertIsNotNone(syminfo_section) ++ ++ # The test files were compiled against libc.so.1 with ++ # direct binding, hence the libc symbols used ++ # (exit, atexit and _exit) have the direct binding flags ++ # in the syminfo table. ++ # We check that this is properly detected. ++ exit_symbols = [s for s in syminfo_section.iter_symbols() ++ if b'exit' in s.name] ++ self.assertNotEqual(len(exit_symbols), 0) ++ ++ for symbol in exit_symbols: ++ # libc.so.1 has the index 0 in the dynamic table ++ self.assertEqual(symbol['si_boundto'], 0) ++ self.assertEqual(symbol['si_flags'], ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECT | ++ SUNW_SYMINFO_FLAGS.SYMINFO_FLG_DIRECTBIND) ++ ++ def test_SUNW_syminfo_section_x86(self): ++ self._test_SUNW_syminfo_section_generic('exe_solaris32_cc.elf') ++ ++ def test_SUNW_syminfo_section_x64(self): ++ self._test_SUNW_syminfo_section_generic('exe_solaris64_cc.elf') ++ ++ def test_SUNW_syminfo_section_sparc32(self): ++ self._test_SUNW_syminfo_section_generic('exe_solaris32_cc.elf.sparc') ++ ++ def test_SUNW_syminfo_section_sparc64(self): ++ self._test_SUNW_syminfo_section_generic('exe_solaris64_cc.elf.sparc') ++ ++if __name__ == '__main__': ++ unittest.main() +diff -r 249a5ca85159 test/testfiles/exe_simple32.elf +Binary file test/testfiles/exe_simple32.elf has changed +diff -r 249a5ca85159 test/testfiles/exe_simple64.elf +Binary file test/testfiles/exe_simple64.elf has changed +diff -r 249a5ca85159 test/testfiles/exe_stripped64.elf +Binary file test/testfiles/exe_stripped64.elf has changed +diff -r 249a5ca85159 test/testfiles/libelf0_8_13_32bit.so.elf +Binary file test/testfiles/libelf0_8_13_32bit.so.elf has changed +diff -r 249a5ca85159 test/testfiles/obj_simple32.o.elf +Binary file test/testfiles/obj_simple32.o.elf has changed +diff -r 249a5ca85159 test/testfiles/penalty_32_gcc.o.elf +Binary file test/testfiles/penalty_32_gcc.o.elf has changed +diff -r 249a5ca85159 test/testfiles/penalty_64_clang.o.elf +Binary file test/testfiles/penalty_64_clang.o.elf has changed +diff -r 249a5ca85159 test/testfiles/penalty_64_gcc.o.elf +Binary file test/testfiles/penalty_64_gcc.o.elf has changed +diff -r 249a5ca85159 test/testfiles/simple_gcc.elf.arm +Binary file test/testfiles/simple_gcc.elf.arm has changed +diff -r 249a5ca85159 test/testfiles/update32.o.elf +Binary file test/testfiles/update32.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/clang33-simple.o +Binary file test/testfiles_for_readelf/clang33-simple.o has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/exe_simple32.elf +Binary file test/testfiles_for_readelf/exe_simple32.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/exe_simple64.elf +Binary file test/testfiles_for_readelf/exe_simple64.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/exe_stripped64.elf +Binary file test/testfiles_for_readelf/exe_stripped64.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/gcc48-simple.o +Binary file test/testfiles_for_readelf/gcc48-simple.o has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/gcc48-simple.src.c +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/test/testfiles_for_readelf/gcc48-simple.src.c Mon Jun 03 17:52:42 2013 +0200 +@@ -0,0 +1,19 @@ ++/* Generated by compiling with gcc 4.8 as follows: ++** ++** gcc-4.8 -O0 -g -fno-dwarf2-cfi-asm -c dwarf4_simple.c -o gcc48-simple. ++** ++** Note: -fno-dwarf2-cfi-asm to tell gcc to generate .dwarf_frames as well ++** as the .eh_frames it generates by default. ++** ++*/ ++ ++extern int bar(int); ++extern int baz(int); ++ ++int foo(int v) { ++ int x = bar(v); ++ int i; ++ for (i = 0; i < v; ++i) ++ x += bar(i) + bar(v) * baz(i); ++ return x; ++} +diff -r 249a5ca85159 test/testfiles_for_readelf/libelf0_8_13_32bit.so.elf +Binary file test/testfiles_for_readelf/libelf0_8_13_32bit.so.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/obj_simple32.o.elf +Binary file test/testfiles_for_readelf/obj_simple32.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_32_gcc.o.elf +Binary file test/testfiles_for_readelf/penalty_32_gcc.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_64_clang.o.elf +Binary file test/testfiles_for_readelf/penalty_64_clang.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/penalty_64_gcc.o.elf +Binary file test/testfiles_for_readelf/penalty_64_gcc.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_readelf/update32.o.elf +Binary file test/testfiles_for_readelf/update32.o.elf has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris32_cc.elf +Binary file test/testfiles_for_unittests/exe_solaris32_cc.elf has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris32_cc.elf.sparc +Binary file test/testfiles_for_unittests/exe_solaris32_cc.elf.sparc has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris64_cc.elf +Binary file test/testfiles_for_unittests/exe_solaris64_cc.elf has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/exe_solaris64_cc.elf.sparc +Binary file test/testfiles_for_unittests/exe_solaris64_cc.elf.sparc has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/lib_versioned64.so.1.elf +Binary file test/testfiles_for_unittests/lib_versioned64.so.1.elf has changed +diff -r 249a5ca85159 test/testfiles_for_unittests/simple_gcc.elf.arm +Binary file test/testfiles_for_unittests/simple_gcc.elf.arm has changed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 18:18:09 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:18:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21255] csw/mgar/pkg/libjpeg7/branches Message-ID: Revision: 21255 http://gar.svn.sourceforge.net/gar/?rev=21255&view=rev Author: mattdarcy Date: 2013-06-03 16:18:09 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial package for nim test branch Modified Paths: -------------- csw/mgar/pkg/libjpeg7/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/libjpeg7/branches/nim/ Modified: csw/mgar/pkg/libjpeg7/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libjpeg7/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/libjpeg7/branches/nim/Makefile 2013-06-03 16:18:09 UTC (rev 21255) @@ -1,6 +1,6 @@ NAME = jpeg VERSION = 7 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = JPEG library and tools by the Independent JPEG Group define BLURB @@ -13,29 +13,29 @@ LICENSE = README -FOREIGN_PACKAGES += CSWlibjpeg62 +FOREIGN_PACKAGES += NIMOSSlibjpeg62 -PACKAGES += CSWjpeg -CATALOGNAME_CSWjpeg = jpeg -SPKG_DESC_CSWjpeg += JPEG library and tools by the Independent JPEG Group +PACKAGES += NIMOSSjpeg +CATALOGNAME_NIMOSSjpeg = jpeg +SPKG_DESC_NIMOSSjpeg += JPEG library and tools by the Independent JPEG Group # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg7 -# This is for legacy packages compiled against libjpeg.so.62 and depend on the unified CSWjpeg which +RUNTIME_DEP_PKGS_NIMOSSjpeg += NIMOSSlibjpeg7 +# This is for legacy packages compiled against libjpeg.so.62 and depend on the unified NIMOSSjpeg which # contained both shared libraries in the past. -RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg62 +RUNTIME_DEP_PKGS_NIMOSSjpeg += NIMOSSlibjpeg62 # Overwrite this for now until the package has been released -CHECKPKG_OVERRIDES_CSWjpeg += surplus-dependency|CSWlibjpeg62 -CHECKPKG_OVERRIDES_CSWjpeg += unidentified-dependency|CSWlibjpeg62 +CHECKPKG_OVERRIDES_NIMOSSjpeg += surplus-dependency|NIMOSSlibjpeg62 +CHECKPKG_OVERRIDES_NIMOSSjpeg += unidentified-dependency|NIMOSSlibjpeg62 -PACKAGES += CSWlibjpeg7 -SPKG_DESC_CSWlibjpeg7 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.7 -PKGFILES_CSWlibjpeg7 = $(call pkgfiles_lib,libjpeg.so.7) +PACKAGES += NIMOSSlibjpeg7 +SPKG_DESC_NIMOSSlibjpeg7 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.7 +PKGFILES_NIMOSSlibjpeg7 = $(call pkgfiles_lib,libjpeg.so.7) -PACKAGES += CSWlibjpeg-dev -SPKG_DESC_CSWlibjpeg-dev += Development files for libjpeg.so.7 -PKGFILES_CSWlibjpeg-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibjpeg-dev += CSWlibjpeg7 +PACKAGES += NIMOSSlibjpeg-dev +SPKG_DESC_NIMOSSlibjpeg-dev += Development files for libjpeg.so.7 +PKGFILES_NIMOSSlibjpeg-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_NIMOSSlibjpeg-dev += NIMOSSlibjpeg7 BUILD64 = 1 ISAEXEC = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 18:32:16 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:32:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21256] csw/mgar/pkg/bzip2/branches Message-ID: Revision: 21256 http://gar.svn.sourceforge.net/gar/?rev=21256&view=rev Author: mattdarcy Date: 2013-06-03 16:32:15 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial checkin for test package for the nim test branch Modified Paths: -------------- csw/mgar/pkg/bzip2/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/bzip2/branches/nim/ Modified: csw/mgar/pkg/bzip2/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/bzip2/branches/nim/Makefile 2013-06-03 16:32:15 UTC (rev 21256) @@ -2,7 +2,7 @@ NAME = bzip2 VERSION = 1.0.6 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = Compression Utility define BLURB @@ -17,23 +17,23 @@ PATCHFILES += 0001-Fix-build-for-shared-lib-for-Solaris-linker.patch -PACKAGES += CSWbzip2 -SPKG_DESC_CSWbzip2 += Compression utility for bzip2 compression algorithm +PACKAGES += NIMOSSbzip2 +SPKG_DESC_NIMOSSbzip2 += Compression utility for bzip2 compression algorithm # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWbzip2 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_NIMOSSbzip2 += NIMOSSlibbz2-1-0 -PACKAGES += CSWlibbz2-1-0 -SPKG_DESC_CSWlibbz2-1-0 = Compression library, libbz2.so.1.0 -PKGFILES_CSWlibbz2-1-0 += $(call pkgfiles_lib,libbz2.so.1.0) +PACKAGES += NIMOSSlibbz2-1-0 +SPKG_DESC_NIMOSSlibbz2-1-0 = Compression library, libbz2.so.1.0 +PKGFILES_NIMOSSlibbz2-1-0 += $(call pkgfiles_lib,libbz2.so.1.0) -PACKAGES += CSWlibbz2-dev -SPKG_DESC_CSWlibbz2-dev = Development files for libbz2.so.1.0 -PKGFILES_CSWlibbz2-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibbz2-dev += $(docdir)/.* -RUNTIME_DEP_PKGS_CSWlibbz2-dev += CSWlibbz2-1-0 +PACKAGES += NIMOSSlibbz2-dev +SPKG_DESC_NIMOSSlibbz2-dev = Development files for libbz2.so.1.0 +PKGFILES_NIMOSSlibbz2-dev += $(PKGFILES_DEVEL) +PKGFILES_NIMOSSlibbz2-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_NIMOSSlibbz2-dev += NIMOSSlibbz2-1-0 # These are default install locations -CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/CHANGES -CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/README +CHECKPKG_OVERRIDES_NIMOSSlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/CHANGES +CHECKPKG_OVERRIDES_NIMOSSlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/README LICENSE = LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 18:33:57 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:33:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21257] csw/mgar/pkg/freetype/branches Message-ID: Revision: 21257 http://gar.svn.sourceforge.net/gar/?rev=21257&view=rev Author: mattdarcy Date: 2013-06-03 16:33:57 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial checkin for test pacakge on nim test branch Modified Paths: -------------- csw/mgar/pkg/freetype/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/freetype/branches/nim/ Modified: csw/mgar/pkg/freetype/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/freetype/branches/nim/Makefile 2013-06-03 16:33:57 UTC (rev 21257) @@ -1,6 +1,6 @@ NAME = freetype VERSION = 2.4.8 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = A free and portable TrueType font rendering engine define BLURB @@ -21,21 +21,21 @@ VENDOR_URL = http://www.freetype.org/ -PACKAGES += CSWlibfreetype6 -SPKG_DESC_CSWlibfreetype6 = A free and portable TrueType font rendering engine, libfreetype.so.6 -PKGFILES_CSWlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6) -RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibz1 -OBSOLETED_BY_CSWlibfreetype6 += CSWftype2 -CATALOGNAME_CSWftype2 = freetype2_stub +PACKAGES += NIMOSSlibfreetype6 +SPKG_DESC_NIMOSSlibfreetype6 = A free and portable TrueType font rendering engine, libfreetype.so.6 +PKGFILES_NIMOSSlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6) +RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += CSWlibz1 +OBSOLETED_BY_NIMOSSlibfreetype6 += CSWftype2 +CATALOGNAME_NIMOSSftype2 = freetype2_stub # This is inside a comment -CHECKPKG_OVERRIDES_CSWlibfreetype-dev += file-with-bad-content|/usr/local|root/opt/csw/include/ft2build.h +CHECKPKG_OVERRIDES_NIMOSSlibfreetype-dev += file-with-bad-content|/usr/local|root/opt/csw/include/ft2build.h -PACKAGES += CSWlibfreetype-dev -SPKG_DESC_CSWlibfreetype-dev = Development files for libfreetype.so.6 +PACKAGES += NIMOSSlibfreetype-dev +SPKG_DESC_NIMOSSlibfreetype-dev = Development files for libfreetype.so.6 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibfreetype-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_NIMOSSlibfreetype-dev += CSWlibfreetype6 GNUMAKE = gmake EXTRA_CONFIGURE_EXPORTS = GNUMAKE 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 Jun 3 18:52:39 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jun 2013 16:52:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21258] csw/mgar/pkg/cloog/trunk Message-ID: Revision: 21258 http://gar.svn.sourceforge.net/gar/?rev=21258&view=rev Author: wahwah Date: 2013-06-03 16:52:39 +0000 (Mon, 03 Jun 2013) Log Message: ----------- cloog/trunk: use CSWbash for tests Modified Paths: -------------- csw/mgar/pkg/cloog/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cloog/trunk/files/0001-Use-opt-csw-bin-bash-for-tests.patch Modified: csw/mgar/pkg/cloog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 16:33:57 UTC (rev 21257) +++ csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 16:52:39 UTC (rev 21258) @@ -19,8 +19,12 @@ PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc +PATCHFILES += 0001-Use-opt-csw-bin-bash-for-tests.patch + # BUILD_DEP_PKGS = CSWlibppl-dev +BUILD_DEP_PKGS = CSWbash + PACKAGES += CSWlibcloog-isl2 PKGFILES_CSWlibcloog-isl2 += $(call baseisadirs,$(libdir),libcloog-isl\.so\.2(\.\d+)*) SPKG_DESC_CSWlibcloog-isl2 += $(DESCRIPTION), libcloog-isl.so.2 Added: csw/mgar/pkg/cloog/trunk/files/0001-Use-opt-csw-bin-bash-for-tests.patch =================================================================== --- csw/mgar/pkg/cloog/trunk/files/0001-Use-opt-csw-bin-bash-for-tests.patch (rev 0) +++ csw/mgar/pkg/cloog/trunk/files/0001-Use-opt-csw-bin-bash-for-tests.patch 2013-06-03 16:52:39 UTC (rev 21258) @@ -0,0 +1,22 @@ +From 1a5ed77074df4050f72c282d1544ca5a9367bbea Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 3 Jun 2013 18:51:21 +0200 +Subject: [PATCH] Use /opt/csw/bin/bash for tests + +--- + isl/codegen_test.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isl/codegen_test.sh.in b/isl/codegen_test.sh.in +index 4a4852d..637b728 100644 +--- a/isl/codegen_test.sh.in ++++ b/isl/codegen_test.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + + EXEEXT=@EXEEXT@ + srcdir=@srcdir@ +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 20:58:15 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 18:58:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21259] csw/mgar/pkg/libexpat1/branches Message-ID: Revision: 21259 http://gar.svn.sourceforge.net/gar/?rev=21259&view=rev Author: mattdarcy Date: 2013-06-03 18:58:11 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial checkin for nim test branch Modified Paths: -------------- csw/mgar/pkg/libexpat1/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/libexpat1/branches/nim/ Modified: csw/mgar/pkg/libexpat1/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libexpat1/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/libexpat1/branches/nim/Makefile 2013-06-03 18:58:11 UTC (rev 21259) @@ -1,6 +1,6 @@ NAME = expat VERSION = 2.1.0 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = XML parser toolkit define BLURB @@ -12,24 +12,24 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -# This is for legacy packages depending on CSWexpat to use libexpat.so.0 -FOREIGN_PACKAGES += CSWlibexpat0 +# This is for legacy packages depending on NIMOSSexpat to use libexpat.so.0 +FOREIGN_PACKAGES += NIMOSSlibexpat0 -PACKAGES += CSWlibexpat1 -SPKG_DESC_CSWlibexpat1 = XML parser toolkit, libexpat.so.1 -PKGFILES_CSWlibexpat1 += $(call pkgfiles_lib,libexpat.so.1) +PACKAGES += NIMOSSlibexpat1 +SPKG_DESC_NIMOSSlibexpat1 = XML parser toolkit, libexpat.so.1 +PKGFILES_NIMOSSlibexpat1 += $(call pkgfiles_lib,libexpat.so.1) -PACKAGES += CSWlibexpat-dev -SPKG_DESC_CSWlibexpat-dev += Development files for libexpat.so.1 -PKGFILES_CSWlibexpat-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibexpat-dev += CSWlibexpat1 +PACKAGES += NIMOSSlibexpat-dev +SPKG_DESC_NIMOSSlibexpat-dev += Development files for libexpat.so.1 +PKGFILES_NIMOSSlibexpat-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_NIMOSSlibexpat-dev += CSWlibexpat1 -PACKAGES += CSWexpat -SPKG_DESC_CSWexpat = XML parser toolkit utility -RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat1 -# This is for legacy packages depending on CSWexpat to use libexpat.so.0 -RUNTIME_DEP_PKGS_CSWexpat += CSWlibexpat0 -CHECKPKG_OVERRIDES_CSWexpat += surplus-dependency|CSWlibexpat0 +PACKAGES += NIMOSSexpat +SPKG_DESC_NIMOSSexpat = XML parser toolkit utility +RUNTIME_DEP_PKGS_NIMOSSexpat += CSWlibexpat1 +# This is for legacy packages depending on NIMOSSexpat to use libexpat.so.0 +RUNTIME_DEP_PKGS_NIMOSSexpat += CSWlibexpat0 +CHECKPKG_OVERRIDES_NIMOSSexpat += surplus-dependency|CSWlibexpat0 # Testsuite needs __func__ EXTRA_CXXFLAGS = -features=extensions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 21:10:56 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 19:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21260] csw/mgar/pkg/libpng/branches Message-ID: Revision: 21260 http://gar.svn.sourceforge.net/gar/?rev=21260&view=rev Author: mattdarcy Date: 2013-06-03 19:10:56 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial package for test nim branch Modified Paths: -------------- csw/mgar/pkg/libpng/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/libpng/branches/nim/ Modified: csw/mgar/pkg/libpng/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libpng/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/libpng/branches/nim/Makefile 2013-06-03 19:10:56 UTC (rev 21260) @@ -1,8 +1,8 @@ -# Copyright 2009 OpenCSW +# Copyright 2009 OpenNIMOSS # Distributed under the terms of the GNU General Public License v2 # $Id$ # -# ! The transitional package CSWpng must also pull in libpng.so.3 and +# ! The transitional package NIMOSSpng must also pull in libpng.so.3 and # libpng12.so.0 # * Would be good to also provide ISAs: # sparcv8plus+vis @@ -11,7 +11,7 @@ NAME = libpng VERSION = 1.5.13 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = The official library for Portable Network Graphics format (PNG) define BLURB endef @@ -27,19 +27,19 @@ EXTRA_BUILD_ISAS += sparcv8plus+vis2 EXTRA_BUILD_ISAS += pentium_pro -PACKAGES = CSWlibpng-dev -SPKG_DESC_CSWlibpng-dev = $(DESCRIPTION), development files -RUNTIME_DEP_PKGS_CSWlibpng-dev += CSWlibpng15-15 +PACKAGES = NIMOSSlibpng-dev +SPKG_DESC_NIMOSSlibpng-dev = $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_NIMOSSlibpng-dev += NIMOSSlibpng15-15 -PACKAGES += CSWlibpng15-15 -CATALOGNAME_CSWlibpng15-15 = libpng15_15 -PKGFILES_CSWlibpng15-15 += $(call baseisadirs,$(libdir),libpng15\.so\.15(\.\d+)*) -SPKG_DESC_CSWlibpng15-15 += $(DESCRIPTION), libpng15.so.15 -RUNTIME_DEP_PKGS_CSWlibpng += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibpng15-15 += CSWlibz1 +PACKAGES += NIMOSSlibpng15-15 +CATALOGNAME_NIMOSSlibpng15-15 = libpng15_15 +PKGFILES_NIMOSSlibpng15-15 += $(call baseisadirs,$(libdir),libpng15\.so\.15(\.\d+)*) +SPKG_DESC_NIMOSSlibpng15-15 += $(DESCRIPTION), libpng15.so.15 +RUNTIME_DEP_PKGS_NIMOSSlibpng += NIMOSSlibpng15-15 +RUNTIME_DEP_PKGS_NIMOSSlibpng15-15 += NIMOSSlibz1 -# The CSWpng package must also pull in libpng.so.3 and libpng12.so.0 -OBSOLETED_BY_CSWlibpng15-15 = CSWpng +# The NIMOSSpng package must also pull in libpng.so.3 and libpng12.so.0 +OBSOLETED_BY_NIMOSSlibpng15-15 = NIMOSSpng BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 3 21:15:53 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jun 2013 19:15:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21261] csw/mgar/pkg/cloog/trunk/Makefile Message-ID: Revision: 21261 http://gar.svn.sourceforge.net/gar/?rev=21261&view=rev Author: wahwah Date: 2013-06-03 19:15:53 +0000 (Mon, 03 Jun 2013) Log Message: ----------- cloog/trunk: disable tests - there's one spurious failure Modified Paths: -------------- csw/mgar/pkg/cloog/trunk/Makefile Modified: csw/mgar/pkg/cloog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 19:10:56 UTC (rev 21260) +++ csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 19:15:53 UTC (rev 21261) @@ -44,4 +44,10 @@ RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibgmp10 RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibisl7 +# The failed test was: +# - min(n + c0 - (n + c0 + 2) / 3, c0); c1 += 2) +# + min(c0, n + c0 - (n + c0 + 2) / 3); c1 += 2) +# ...which is the same thing. So this is a spurious error. +SKIPTEST = 1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 21:37:11 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 19:37:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21262] csw/mgar/pkg/gdbm/branches Message-ID: Revision: 21262 http://gar.svn.sourceforge.net/gar/?rev=21262&view=rev Author: mattdarcy Date: 2013-06-03 19:37:11 +0000 (Mon, 03 Jun 2013) Log Message: ----------- initial checkin for package in test nim branch Modified Paths: -------------- csw/mgar/pkg/gdbm/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/gdbm/branches/nim/ Modified: csw/mgar/pkg/gdbm/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/gdbm/branches/nim/Makefile 2013-06-03 19:37:11 UTC (rev 21262) @@ -1,6 +1,6 @@ NAME = gdbm VERSION = 1.9 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = GNU database library for C define BLURB @@ -12,19 +12,19 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -FOREIGN_PACKAGES = CSWlibgdbm3 -OBSOLETED_BY_CSWlibgdbm3 += CSWgdbm +FOREIGN_PACKAGES = NIMOSSlibgdbm3 +OBSOLETED_BY_NIMOSSlibgdbm3 += NIMOSSgdbm -PACKAGES += CSWlibgdbm4 -CATALOGNAME_CSWlibgdbm4 = libgdbm4 -SPKG_DESC_CSWlibgdbm4 = GDBM share library, libgdbm.so.4 -PKGFILES_CSWlibgdbm4 = $(call pkgfiles_lib,libgdbm.so.4) +PACKAGES += NIMOSSlibgdbm4 +CATALOGNAME_NIMOSSlibgdbm4 = libgdbm4 +SPKG_DESC_NIMOSSlibgdbm4 = GDBM share library, libgdbm.so.4 +PKGFILES_NIMOSSlibgdbm4 = $(call pkgfiles_lib,libgdbm.so.4) -PACKAGES += CSWlibgdbm-dev -CATALOGNAME_CSWlibgdbm-dev = libgdbm_dev -SPKG_DESC_CSWlibgdbm-dev = Development files for libgdbm.so.4 +PACKAGES += NIMOSSlibgdbm-dev +CATALOGNAME_NIMOSSlibgdbm-dev = libgdbm_dev +SPKG_DESC_NIMOSSlibgdbm-dev = Development files for libgdbm.so.4 # This is catchall -RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm4 +RUNTIME_DEP_PKGS_NIMOSSlibgdbm-dev = NIMOSSlibgdbm4 BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 3 22:10:46 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 03 Jun 2013 20:10:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21263] csw/mgar/pkg/freetype/branches/nim/Makefile Message-ID: Revision: 21263 http://gar.svn.sourceforge.net/gar/?rev=21263&view=rev Author: mattdarcy Date: 2013-06-03 20:10:46 +0000 (Mon, 03 Jun 2013) Log Message: ----------- few fixes around prefix, made a mistake on first update Modified Paths: -------------- csw/mgar/pkg/freetype/branches/nim/Makefile Modified: csw/mgar/pkg/freetype/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/freetype/branches/nim/Makefile 2013-06-03 19:37:11 UTC (rev 21262) +++ csw/mgar/pkg/freetype/branches/nim/Makefile 2013-06-03 20:10:46 UTC (rev 21263) @@ -24,9 +24,9 @@ PACKAGES += NIMOSSlibfreetype6 SPKG_DESC_NIMOSSlibfreetype6 = A free and portable TrueType font rendering engine, libfreetype.so.6 PKGFILES_NIMOSSlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6) -RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += CSWlibz1 -OBSOLETED_BY_NIMOSSlibfreetype6 += CSWftype2 +RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += NIMOSSlibbz2-1-0 +RUNTIME_DEP_PKGS_NIMOSSlibfreetype6 += NIMOSSlibz1 +OBSOLETED_BY_NIMOSSlibfreetype6 += NIMOSSftype2 CATALOGNAME_NIMOSSftype2 = freetype2_stub # This is inside a comment @@ -35,7 +35,7 @@ PACKAGES += NIMOSSlibfreetype-dev SPKG_DESC_NIMOSSlibfreetype-dev = Development files for libfreetype.so.6 # PKGFILES is catchall -RUNTIME_DEP_PKGS_NIMOSSlibfreetype-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_NIMOSSlibfreetype-dev += NIMOSSlibfreetype6 GNUMAKE = gmake EXTRA_CONFIGURE_EXPORTS = GNUMAKE 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 Jun 3 23:06:56 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jun 2013 21:06:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21264] csw/mgar/pkg/cloog/trunk/Makefile Message-ID: Revision: 21264 http://gar.svn.sourceforge.net/gar/?rev=21264&view=rev Author: wahwah Date: 2013-06-03 21:06:56 +0000 (Mon, 03 Jun 2013) Log Message: ----------- cloog/trunk: adjusted dependencies Modified Paths: -------------- csw/mgar/pkg/cloog/trunk/Makefile Modified: csw/mgar/pkg/cloog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 20:10:46 UTC (rev 21263) +++ csw/mgar/pkg/cloog/trunk/Makefile 2013-06-03 21:06:56 UTC (rev 21264) @@ -25,25 +25,28 @@ BUILD_DEP_PKGS = CSWbash -PACKAGES += CSWlibcloog-isl2 -PKGFILES_CSWlibcloog-isl2 += $(call baseisadirs,$(libdir),libcloog-isl\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibcloog-isl2 += $(DESCRIPTION), libcloog-isl.so.2 -RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibgmp10 -RUNTIME_DEP_PKGS_CSWlibcloog-isl2 += CSWlibisl7 -PACKAGES += CSWlibisl7 -PKGFILES_CSWlibisl7 += $(call baseisadirs,$(libdir),libisl\.so\.7(\.\d+)*) -SPKG_DESC_CSWlibisl7 += $(DESCRIPTION), libisl.so.7 -RUNTIME_DEP_PKGS_CSWlibisl7 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibisl7 += CSWlibgmp10 +PACKAGES += CSWlibcloog-isl4 +PKGFILES_CSWlibcloog-isl4 += $(call baseisadirs,$(libdir),libcloog-isl\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibcloog-isl4 += $(DESCRIPTION), libcloog-isl.so.4 +RUNTIME_DEP_PKGS_CSWlibcloog-isl4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibcloog-isl4 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibcloog-isl4 += CSWlibisl7 +PACKAGES += CSWlibisl10 +PKGFILES_CSWlibisl10 += $(call baseisadirs,$(libdir),libisl\.so\.10(\.\d+)*) +SPKG_DESC_CSWlibisl10 += $(DESCRIPTION), libisl.so.10 +RUNTIME_DEP_PKGS_CSWlibisl10 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibisl10 += CSWlibgmp10 + PACKAGES += CSWcloog-dev SPKG_DESC_CSWcloog-dev += $(DESCRIPTION), development files -RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibcloog-isl4 RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibgmp10 -RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibisl7 +RUNTIME_DEP_PKGS_CSWcloog-dev += CSWlibisl10 +CHECKPKG_OVERRIDES_CSWcloog-dev += missing-dependency|CSWpython + # The failed test was: # - min(n + c0 - (n + c0 + 2) / 3, c0); c1 += 2) # + min(c0, n + c0 - (n + c0 + 2) / 3); c1 += 2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 4 10:35:40 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 04 Jun 2013 08:35:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21265] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21265 http://gar.svn.sourceforge.net/gar/?rev=21265&view=rev Author: cgrzemba Date: 2013-06-04 08:35:40 +0000 (Tue, 04 Jun 2013) Log Message: ----------- qt4-gcc/trunk: refine configure options Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-03 21:06:56 UTC (rev 21264) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-04 08:35:40 UTC (rev 21265) @@ -25,41 +25,69 @@ REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl.cpp +# replace SSL cert location REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp REINPLACE_USRLOCAL += src/3rdparty/webkit/Source/WebCore/plugins/PluginDatabase.cpp PATCHFILES += mkspec-csw.patch # bug in 4.8.1, see: https//bugreports.qt-project.org/browse/QTBUG-25281 PATCHFILES += 0001-shapeinput.patch +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWunixodbc-dev +BUILD_DEP_PKGS += CSWpostgresql-dev +BUILD_DEP_PKGS += CSWfreetds-dev -REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp -REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp -# replace SSL cert location -REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp - # http://wiki.opencsw.org/porting-faq#toc9 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS -CONFIGURE_ARGS += -platform solaris-g++ -CONFIGURE_ARGS += -opensource +platform_arg = solaris-g++ + CONFIGURE_ARGS += -confirm-license CONFIGURE_ARGS += -prefix $(prefix) +CONFIGURE_ARGS += -docdir $(sharedstatedir)/$(NAME)$(MAJOR)/doc +CONFIGURE_ARGS += -datadir $(sharedstatedir)/$(NAME)$(MAJOR) CONFIGURE_ARGS += -plugindir $(libdir)/$(NAME)$(MAJOR)/plugins -CONFIGURE_ARGS += -docdir $(docdir)/$(NAME)$(MAJOR) +CONFIGURE_ARGS += -importdir $(libdir)/$(NAME)$(MAJOR)/imports CONFIGURE_ARGS += -translationdir $(sharedstatedir)/$(NAME)$(MAJOR)/translations -CONFIGURE_ARGS += -importdir $(libdir)/$(NAME)$(MAJOR)/imports -CONFIGURE_ARGS += -demosdir $(sharedstatedir)/$(NAME)$(MAJOR)/demos +# CONFIGURE_ARGS += -sysconfdir $(syconfdir)/$(NAME)$(MAJOR) +CONFIGURE_ARGS += -sysconfdir /etc/xdg +CONFIGURE_ARGS += -demosdir $(libdir)/$(NAME)$(MAJOR)/demos CONFIGURE_ARGS += -examplesdir $(libdir)/$(NAME)$(MAJOR)/examples -CONFIGURE_ARGS += -datadir $(sharedstatedir)/$(NAME)$(MAJOR) -CONFIGURE_ARGS += -sysconfdir $(syconfdir)/$(NAME)$(MAJOR) +CONFIGURE_ARGS += -opensource +#debain args -- without windows only options, defaults, undocumented options +CONFIGURE_ARGS += -fast +CONFIGURE_ARGS += -plugin-sql-mysql +CONFIGURE_ARGS += -plugin-sql-odbc +CONFIGURE_ARGS += -plugin-sql-psql +CONFIGURE_ARGS += -plugin-sql-sqlite +CONFIGURE_ARGS += -plugin-sql-tds +CONFIGURE_ARGS += -system-sqlite +CONFIGURE_ARGS += -platform $(platform_arg) +CONFIGURE_ARGS += -system-zlib +CONFIGURE_ARGS += -system-libtiff +CONFIGURE_ARGS += -system-libpng +CONFIGURE_ARGS += -system-libjpeg +CONFIGURE_ARGS += -no-rpath +CONFIGURE_ARGS += -reduce-relocations +CONFIGURE_ARGS += -no-separate-debug-info +CONFIGURE_ARGS += -verbose +CONFIGURE_ARGS += -lfontconfig +CONFIGURE_ARGS += -I$(includedir)/freetype2 +#endof debin args CONFIGURE_ARGS += -no-qt3support CONFIGURE_ARGS += -no-xshape -CONFIGURE_ARGS += -webkit -CONFIGURE_ARGS += -v -shared -stl -largefile -sm -CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib +CONFIGURE_ARGS += -v +CONFIGURE_ARGS += -shared +CONFIGURE_ARGS += -stl +CONFIGURE_ARGS += -largefile +CONFIGURE_ARGS += -sm +CONFIGURE_ARGS += -qt-libjpeg +CONFIGURE_ARGS += -qt-libpng +CONFIGURE_ARGS += -qt-libmng +CONFIGURE_ARGS += -qt-zlib # compile error: error: 'QGtkStyle' has not been declared ??? since 10.12.2012 CONFIGURE_ARGS += -no-gtkstyle -CONFIGURE_ARGS += -I$(BUILD_PREFIX)/include/gtk-2.0 +CONFIGURE_ARGS += -I$(includedir)/gtk-2.0 CONFIGURE_ARGS += -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include CONFIGURE_ARGS_sparc += -big-endian -host-big-endian 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 Jun 4 17:47:48 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Jun 2013 15:47:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21266] csw/mgar/pkg Message-ID: Revision: 21266 http://gar.svn.sourceforge.net/gar/?rev=21266&view=rev Author: pfelecan Date: 2013-06-04 15:47:46 +0000 (Tue, 04 Jun 2013) Log Message: ----------- qjson/trunk: instantiate Added Paths: ----------- csw/mgar/pkg/qjson/ csw/mgar/pkg/qjson/Makefile csw/mgar/pkg/qjson/branches/ csw/mgar/pkg/qjson/tags/ csw/mgar/pkg/qjson/trunk/ csw/mgar/pkg/qjson/trunk/Makefile csw/mgar/pkg/qjson/trunk/checksums csw/mgar/pkg/qjson/trunk/files/ csw/mgar/pkg/qjson/trunk/files/0001-Inhibit-GUI-for-tests.patch Added: csw/mgar/pkg/qjson/Makefile =================================================================== --- csw/mgar/pkg/qjson/Makefile (rev 0) +++ csw/mgar/pkg/qjson/Makefile 2013-06-04 15:47:46 UTC (rev 21266) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/qjson/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/qjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/qjson/trunk/Makefile (rev 0) +++ csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 15:47:46 UTC (rev 21266) @@ -0,0 +1,58 @@ +# $Id$ + +NAME = qjson +VERSION = 1.0.0 +GARTYPE = v2 + +DESCRIPTION = Qt-based library that maps JSON data to QVariant objects +define BLURB + QJson is a Qt-based library that maps JSON data to QVariant objects: + JSON arrays will be mapped to QVariantList instances, while JSON + objects will be mapped to QVariantMap. +endef + +GITHUB_USER = flavio +GITHUB_REFERENCE= 1_0_0 +MASTER_SITES = $(GITHUB_MIRROR) +VENDOR_URL = http://qjson.sourceforge.net/ +DISTNAME = $(GITHUB_USER)-$(NAME)-101a7c5 +DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) +PATCHFILES += 0001-Inhibit-GUI-for-tests.patch + +BUILD_DEP_PKGS += CSWcmake +BUILD_DEP_PKGS += CSWqt4-dev + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_SCRIPTS = custom + +# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix) +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" +CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON +CMAKE_ARGS += -DQJSON_BUILD_TESTS=yes + +TEST_SCRIPTS = custom + +include gar/category.mk + +configure-custom: + (cd $(WORKSRC) && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + cmake \ + . \ + $(CMAKE_ARGS)) + @$(MAKECOOKIE) + +test-custom: + (cd $(WORKSRC)/tests && \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + $(MAKE) ARGS="--verbose --interactive-debug-mode 1" test) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/qjson/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/qjson/trunk/checksums =================================================================== --- csw/mgar/pkg/qjson/trunk/checksums (rev 0) +++ csw/mgar/pkg/qjson/trunk/checksums 2013-06-04 15:47:46 UTC (rev 21266) @@ -0,0 +1 @@ +58b70e47dced2e36a88f77379001fd0b qjson-1.0.0.tar.gz Added: csw/mgar/pkg/qjson/trunk/files/0001-Inhibit-GUI-for-tests.patch =================================================================== --- csw/mgar/pkg/qjson/trunk/files/0001-Inhibit-GUI-for-tests.patch (rev 0) +++ csw/mgar/pkg/qjson/trunk/files/0001-Inhibit-GUI-for-tests.patch 2013-06-04 15:47:46 UTC (rev 21266) @@ -0,0 +1,26 @@ +From 0a3bc2e68033abf70d9d46f205d66b707b0c1cb1 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 4 Jun 2013 17:31:06 +0200 +Subject: [PATCH] Inhibit GUI for tests + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index afdb581..3625cdb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,9 @@ + PROJECT(qjson) + ++# this is necessary to run the tests without an X server available; ++# anyway, the library is not GUI oriented ++SET( QT_DONT_USE_QTGUI TRUE ) ++ + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) + + # Force cmake 2.8.8 in order to have a decent support of Qt5 +-- +1.8.1.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 Jun 4 18:28:40 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Jun 2013 16:28:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21267] csw/mgar/pkg/qjson/trunk/Makefile Message-ID: Revision: 21267 http://gar.svn.sourceforge.net/gar/?rev=21267&view=rev Author: pfelecan Date: 2013-06-04 16:28:40 +0000 (Tue, 04 Jun 2013) Log Message: ----------- qjson/trunk: split in run-time and development sub-packages Modified Paths: -------------- csw/mgar/pkg/qjson/trunk/Makefile Modified: csw/mgar/pkg/qjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 15:47:46 UTC (rev 21266) +++ csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 16:28:40 UTC (rev 21267) @@ -39,6 +39,23 @@ TEST_SCRIPTS = custom +PACKAGES += CSWlibqjson1 +CATALOGNAME_CSWlibqjson1 = libqjson1 +PKGFILES_CSWlibqjson1 += $(call baseisadirs,$(libdir),libqjson\.so\.1\.0\.0) +PKGFILES_CSWlibqjson1 += $(call baseisadirs,$(libdir),libqjson\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibqjson1 += $(DESCRIPTION), libqjson.so.1 +RUNTIME_DEP_PKGS_CSWlibqjson1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqjson1 += CSWlibqtcore4 + +PACKAGES += CSWqjson-dev +CATALOGNAME_CSWqjson-dev = qjson_dev +SPKG_DESC_CSWqjson-dev += $(DESCRIPTION), development files +PKGFILES_CSWqjson-dev += /opt/csw/lib/libqjson.so +PKGFILES_CSWqjson-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWqjson-dev += /opt/csw/lib/cmake/qjson/.* +RUNTIME_DEP_PKGS_CSWqjson-dev += CSWlibqjson1 +ARCHALL_CSWqjson-dev = 1 + include gar/category.mk configure-custom: 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 Jun 4 18:34:51 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Jun 2013 16:34:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21268] csw/mgar/pkg/qjson/trunk/Makefile Message-ID: Revision: 21268 http://gar.svn.sourceforge.net/gar/?rev=21268&view=rev Author: pfelecan Date: 2013-06-04 16:34:51 +0000 (Tue, 04 Jun 2013) Log Message: ----------- qjson/trunk: addition of the development package override (there are no architecture dependent components) Modified Paths: -------------- csw/mgar/pkg/qjson/trunk/Makefile Modified: csw/mgar/pkg/qjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 16:28:40 UTC (rev 21267) +++ csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 16:34:51 UTC (rev 21268) @@ -55,6 +55,7 @@ PKGFILES_CSWqjson-dev += /opt/csw/lib/cmake/qjson/.* RUNTIME_DEP_PKGS_CSWqjson-dev += CSWlibqjson1 ARCHALL_CSWqjson-dev = 1 +CHECKPKG_OVERRIDES_CSWqjson-dev += archall-devel-package 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 Tue Jun 4 18:40:17 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 04 Jun 2013 16:40:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21269] csw/mgar/pkg/qjson/trunk/Makefile Message-ID: Revision: 21269 http://gar.svn.sourceforge.net/gar/?rev=21269&view=rev Author: pfelecan Date: 2013-06-04 16:40:17 +0000 (Tue, 04 Jun 2013) Log Message: ----------- qjson/trunk: removed unnecessary arguments for the tests Modified Paths: -------------- csw/mgar/pkg/qjson/trunk/Makefile Modified: csw/mgar/pkg/qjson/trunk/Makefile =================================================================== --- csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 16:34:51 UTC (rev 21268) +++ csw/mgar/pkg/qjson/trunk/Makefile 2013-06-04 16:40:17 UTC (rev 21269) @@ -72,5 +72,5 @@ (cd $(WORKSRC)/tests && \ /usr/bin/env -i \ $(CONFIGURE_ENV) \ - $(MAKE) ARGS="--verbose --interactive-debug-mode 1" test) + $(MAKE) test) @$(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 Tue Jun 4 22:25:26 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 04 Jun 2013 20:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21270] csw/mgar/pkg Message-ID: Revision: 21270 http://gar.svn.sourceforge.net/gar/?rev=21270&view=rev Author: lblume Date: 2013-06-04 20:25:25 +0000 (Tue, 04 Jun 2013) Log Message: ----------- bass-cd/trunk: Add Beneath a Steel Sky Added Paths: ----------- csw/mgar/pkg/bass-cd/ csw/mgar/pkg/bass-cd/Makefile csw/mgar/pkg/bass-cd/branches/ csw/mgar/pkg/bass-cd/tags/ csw/mgar/pkg/bass-cd/trunk/ csw/mgar/pkg/bass-cd/trunk/Makefile csw/mgar/pkg/bass-cd/trunk/checksums csw/mgar/pkg/bass-cd/trunk/files/ Added: csw/mgar/pkg/bass-cd/Makefile =================================================================== --- csw/mgar/pkg/bass-cd/Makefile (rev 0) +++ csw/mgar/pkg/bass-cd/Makefile 2013-06-04 20:25:25 UTC (rev 21270) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/bass-cd/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/bass-cd/trunk/Makefile =================================================================== --- csw/mgar/pkg/bass-cd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bass-cd/trunk/Makefile 2013-06-04 20:25:25 UTC (rev 21270) @@ -0,0 +1,34 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = bass-cd +VERSION = 1.2 +GARTYPE = v2 + +DESCRIPTION = Beneath a Steel Sky, Freeware CD Version +define BLURB + Robert Foster is an innocent outsider stranded in a vast city where oppressed civilians live and work in soaring tower blocks... while the corrupt, covetous and rich lie underground, shielded from all pollution. Alone, save for a robot circuit board, Foster must fight for survival... and discover the sinister truth behind his abduction... +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = scummvm +DISTFILES = $(DISTNAME).zip + +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +BUILD_DEP_PKGS += CSWscummvm + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(NAME) (custom)" + @echo worksrc: $(WORKSRC) + @ginstall -m 755 -d $(DESTDIR)$(datadir)/scummvm/$(DISTNAME) + @ginstall -m 644 -p $(WORKSRC)/* $(DESTDIR)$(datadir)/scummvm/$(DISTNAME) + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/bass-cd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bass-cd/trunk/checksums =================================================================== --- csw/mgar/pkg/bass-cd/trunk/checksums (rev 0) +++ csw/mgar/pkg/bass-cd/trunk/checksums 2013-06-04 20:25:25 UTC (rev 21270) @@ -0,0 +1 @@ +1d4401cd663715332abe8bb5431e356d bass-cd-1.2.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 5 10:00:22 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 05 Jun 2013 08:00:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21271] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21271 http://gar.svn.sourceforge.net/gar/?rev=21271&view=rev Author: cgrzemba Date: 2013-06-05 08:00:09 +0000 (Wed, 05 Jun 2013) Log Message: ----------- qt4-gcc/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-04 20:25:25 UTC (rev 21270) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-05 08:00:09 UTC (rev 21271) @@ -35,6 +35,7 @@ BUILD_DEP_PKGS += CSWunixodbc-dev BUILD_DEP_PKGS += CSWpostgresql-dev BUILD_DEP_PKGS += CSWfreetds-dev +BUILD_DEP_PKGS += CSWmysql-dev # http://wiki.opencsw.org/porting-faq#toc9 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS @@ -109,7 +110,6 @@ RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibqtcore4 = CSWlibqtcore4-gxx PACKAGES += CSWlibqtgui4 PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*) @@ -124,15 +124,15 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1 -OBSOLETED_BY_CSWlibqtgui4 = CSWlibqtgui4-gxx PACKAGES += CSWqt4-dev SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL) PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*) +PKGFILES_CSWqt4-dev += $(libdir)/libQt.*\.prl PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/examples/.* PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/plugins/.* -PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/demos/.* +PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/demos/.* PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/imports/.* PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/mkspecs/.* RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4 @@ -173,16 +173,16 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstbase0-10-0 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstinterfaces0-10-0 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstaudio0-10-0 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 -# These are code examples. -CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement -# REFINE this later! -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content -CHECKPKG_OVERRIDES_CSWqt4-dev += discouraged-path-in-pkgmap # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus -OBSOLETED_BY_CSWqt4-dev = CSWqt4-dev-gxx PACKAGES += CSWlibqthelp4 PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*) @@ -194,7 +194,6 @@ RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtcore4 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtsql4 RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtclucene4 -OBSOLETED_BY_CSWlibqthelp4 = CSWlibqthelp4-gxx PACKAGES += CSWlibqtmultimedia4 PKGFILES_CSWlibqtmultimedia4 += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*) @@ -203,7 +202,6 @@ RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtmultimedia4 = CSWlibqtmultimedia4-gxx PACKAGES += CSWlibqtnetwork4 PKGFILES_CSWlibqtnetwork4 += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*) @@ -212,7 +210,6 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4 CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1 -OBSOLETED_BY_CSWlibqtnetwork4 = CSWlibqtnetwork4-gxx PACKAGES += CSWlibqtopengl4 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) @@ -225,7 +222,6 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH)) -OBSOLETED_BY_CSWlibqtopengl4 = CSWlibqtopengl4-gxx PACKAGES += CSWlibqtscript4 @@ -234,7 +230,6 @@ RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtscript4 = CSWlibqtscript4-gxx PACKAGES += CSWlibqtscripttools4 PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*) @@ -244,7 +239,6 @@ RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtscripttools4 = CSWlibqtscripttools4-gxx PACKAGES += CSWlibqtsql4 PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*) @@ -252,7 +246,6 @@ RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtsql4 = CSWlibqtsql4-gxx PACKAGES += CSWlibqtsvg4 PKGFILES_CSWlibqtsvg4 += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*) @@ -261,7 +254,6 @@ RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtsvg4 = CSWlibqtsvg4-gxx PACKAGES += CSWlibqttest4 PKGFILES_CSWlibqttest4 += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*) @@ -269,7 +261,6 @@ RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqttest4 = CSWlibqttest4-gxx PACKAGES += CSWlibphonon4 PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*) @@ -280,7 +271,6 @@ RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibphonon4 = CSWlibphonon4-gxx PACKAGES += CSWlibqtclucene4 PKGFILES_CSWlibqtclucene4 += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*) @@ -289,7 +279,6 @@ RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4 # RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4 -OBSOLETED_BY_CSWlibqtclucene4 = CSWlibqtclucene4-gxx PACKAGES += CSWlibqtdbus4 PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*) @@ -298,7 +287,6 @@ RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4 RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtdbus4 = CSWlibqtdbus4-gxx PACKAGES += CSWlibqtdeclarative4 PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*) @@ -311,7 +299,6 @@ # RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4 -OBSOLETED_BY_CSWlibqtdeclarative4 = CSWlibqtdeclarative4-gxx PACKAGES += CSWlibqtdesigner4 PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*) @@ -322,7 +309,6 @@ RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibqtdesigner4 = CSWlibqtdesigner4-gxx PACKAGES += CSWlibqtdesignercomponents4 PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*) @@ -334,8 +320,6 @@ RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibqtdesignercomponents4 = CSWlibqtdesignercomponents4-gxx -CHECKPKG_OVERRIDES_CSWlibqtdesignercomponents4-gxx += catalogname-too-long PACKAGES += CSWlibqtxml4 PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*) @@ -343,14 +327,12 @@ RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4 -OBSOLETED_BY_CSWlibqtxml4 = CSWlibqtxml4-gxx PACKAGES += CSWqt4-doc SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation # Catch-all ARCHALL_CSWqt4-doc = 1 CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content -OBSOLETED_BY_CSWqt4-doc = CSWqt4-doc-gxx include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 5 10:25:01 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 05 Jun 2013 08:25:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21272] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21272 http://gar.svn.sourceforge.net/gar/?rev=21272&view=rev Author: cgrzemba Date: 2013-06-05 08:25:00 +0000 (Wed, 05 Jun 2013) Log Message: ----------- qt4-gcc/trunk: add checkoverride /usr/share Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-05 08:00:09 UTC (rev 21271) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-05 08:25:00 UTC (rev 21272) @@ -157,14 +157,12 @@ # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgthread2-0-0 # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgmodule2-0-0 # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstreamer # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxrender RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWmesa RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibglib2-0-0 # RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3 @@ -180,6 +178,7 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstvideo0-10-0 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstaudio0-10-0 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 5 10:47:01 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 05 Jun 2013 08:47:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21273] csw/mgar/pkg/cups/trunk Message-ID: Revision: 21273 http://gar.svn.sourceforge.net/gar/?rev=21273&view=rev Author: cgrzemba Date: 2013-06-05 08:47:01 +0000 (Wed, 05 Jun 2013) Log Message: ----------- cups/trunk: new version 1.5.4 Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2013-06-05 08:25:00 UTC (rev 21272) +++ csw/mgar/pkg/cups/trunk/Makefile 2013-06-05 08:47:01 UTC (rev 21273) @@ -3,7 +3,7 @@ # $Id$ NAME = cups -VERSION = 1.5.3 +VERSION = 1.5.4 GARTYPE = v2 define BLURB @@ -30,9 +30,9 @@ # GARFLAVOR = DBG # These are the source mirrors published on the CUPS home-page. -CUPS_MIRRORS = http://ftp.easysw.com/pub -CUPS_MIRRORS += ftp://ftp2.easysw.com/pub -CUPS_MIRRORS += ftp://ftp3.easysw.com/pub +# CUPS_MIRRORS = http://ftp.easysw.com/pub +# CUPS_MIRRORS += ftp://ftp2.easysw.com/pub +# CUPS_MIRRORS += ftp://ftp3.easysw.com/pub CUPS_MIRRORS += http://www.nu6.org/_/mirror/ftp.easysw.com/pub CUPS_MIRRORS += http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub CUPS_MIRRORS += ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub @@ -50,7 +50,7 @@ DISTFILES += CSWcupsclient.README PATCHFILES += 0001-cswcups-for-the-service-name.patch -PATCHFILES += 0002-use-posix-shell-in-install.sh.patch +# PATCHFILES += 0002-use-posix-shell-in-install.sh.patch # PATCHFILES = 0001-cswcups-for-service-name.patch # PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch # PATCHFILES += 0003-Reference-counting-for-printers-only.patch Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2013-06-05 08:25:00 UTC (rev 21272) +++ csw/mgar/pkg/cups/trunk/checksums 2013-06-05 08:47:01 UTC (rev 21273) @@ -1 +1 @@ -e1ad15257aa6f162414ea3beae0c5df8 cups-1.5.3-source.tar.bz2 +de3006e5cf1ee78a9c6145ce62c4e982 cups-1.5.4-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 5 10:49:32 2013 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 05 Jun 2013 08:49:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21274] csw/mgar/pkg/bind/trunk Message-ID: Revision: 21274 http://gar.svn.sourceforge.net/gar/?rev=21274&view=rev Author: bonivart Date: 2013-06-05 08:49:32 +0000 (Wed, 05 Jun 2013) Log Message: ----------- bind/trunk: update to 9.9.3-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2013-06-05 08:47:01 UTC (rev 21273) +++ csw/mgar/pkg/bind/trunk/Makefile 2013-06-05 08:49:32 UTC (rev 21274) @@ -6,23 +6,23 @@ GARTYPE = v2 # Enable these for Px-releases -#RELEASE = P2 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2013-06-05 08:47:01 UTC (rev 21273) +++ csw/mgar/pkg/bind/trunk/checksums 2013-06-05 08:49:32 UTC (rev 21274) @@ -1 +1 @@ -7baa8359f0773e04f63d7e694db1909c bind-9.9.3.tar.gz +cf9cd9238d7bc15f1b4a5a5fff90f0d4 bind-9.9.3-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Wed Jun 5 11:45:58 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Wed, 05 Jun 2013 09:45:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21275] csw/mgar/pkg/perl/branches Message-ID: Revision: 21275 http://gar.svn.sourceforge.net/gar/?rev=21275&view=rev Author: mattdarcy Date: 2013-06-05 09:45:56 +0000 (Wed, 05 Jun 2013) Log Message: ----------- test perl build for nim test branch while learning how different location builds work and fix issues and document issues in bts branch Modified Paths: -------------- csw/mgar/pkg/perl/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/perl/branches/nim/ Modified: csw/mgar/pkg/perl/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/perl/branches/nim/Makefile 2013-06-05 09:45:56 UTC (rev 21275) @@ -116,11 +116,11 @@ CONFIGURE_ARGS += -Dscriptdir=$(bindir) # CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitearch=/opt/csw/local/lib/perl/$(VERSION_MAJOR) -CONFIGURE_ARGS += -Dsitelib=/opt/csw/local/share/perl/$(VERSION) -CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw/local/share/man/man1 -CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/local/share/man/man3 -CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/local +CONFIGURE_ARGS += -Dsitearch=/opt/csw/nimoss/local/lib/perl/$(VERSION_MAJOR) +CONFIGURE_ARGS += -Dsitelib=/opt/csw/nimoss/local/share/perl/$(VERSION) +CONFIGURE_ARGS += -Dsiteman1dir=/opt/csw/nimoss/local/share/man/man1 +CONFIGURE_ARGS += -Dsiteman3dir==/opt/csw/nimoss/local/share/man/man3 +CONFIGURE_ARGS += -Dsiteprefix=/opt/csw/nimoss/local CONFIGURE_ARGS += -Duseshrplib CONFIGURE_ARGS += -Dusesitecustomize CONFIGURE_ARGS += -Dusethreads 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 Jun 5 11:54:01 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jun 2013 09:54:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21276] csw/mgar/pkg Message-ID: Revision: 21276 http://gar.svn.sourceforge.net/gar/?rev=21276&view=rev Author: dmichelsen Date: 2013-06-05 09:54:01 +0000 (Wed, 05 Jun 2013) Log Message: ----------- libmng/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libmng/ csw/mgar/pkg/libmng/Makefile csw/mgar/pkg/libmng/branches/ csw/mgar/pkg/libmng/tags/ csw/mgar/pkg/libmng/trunk/ csw/mgar/pkg/libmng/trunk/Makefile csw/mgar/pkg/libmng/trunk/checksums csw/mgar/pkg/libmng/trunk/files/ csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch Added: csw/mgar/pkg/libmng/Makefile =================================================================== --- csw/mgar/pkg/libmng/Makefile (rev 0) +++ csw/mgar/pkg/libmng/Makefile 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libmng/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libmng/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmng/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libmng/trunk/Makefile 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1,52 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libmng +VERSION = 1.0.10 +GARTYPE = v2 + +DESCRIPTION = Library for Multiple-image Network Graphics format (MNG) + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.bz2 + +# Taken from https://github.com/freddix/libmng +PATCHFILES += libmng-automake.patch +PATCHFILES += libmng-gcc4.patch + +PATCHFILES += 0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch + +VENDOR_URL = http://libmng.com + +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWliblcms-dev +BUILD_DEP_PKGS += CSWlibz-dev + +PACKAGES += CSWlibmng1 +SPKG_DESC_CSWlibmng1 = Library for Multiple-image Network Graphics format (MNG), libmng.so.1 +PKGFILES_CSWlibmng1 += $(call pkgfiles_lib,libmng.so.1) +RUNTIME_DEP_PKGS_CSWlibmng1 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibmng1 += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWlibmng1 += CSWlibz1 +OBSOLETED_BY_CSWlibmng1 += CSWlibmng + +PACKAGES += CSWlibmng-dev +SPKG_DESC_CSWlibmng-dev = Development files for libmng.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibmng-dev += CSWlibmng1 + +BUILD64_LIBS_ONLY = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-jpeg +CONFIGURE_ARGS += --with-zlib + +include gar/category.mk + +pre-configure: + cd $(WORKSRC) && cp makefiles/Makefile.am . + cd $(WORKSRC) && cp makefiles/configure.in . + cd $(WORKSRC) && cp doc/makefiles/Makefile.am doc + cd $(WORKSRC) && cp doc/man/makefiles/Makefile.am doc/man + cd $(WORKSRC) && bash unmaintained/autogen.sh + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libmng/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libmng/trunk/checksums =================================================================== --- csw/mgar/pkg/libmng/trunk/checksums (rev 0) +++ csw/mgar/pkg/libmng/trunk/checksums 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1 @@ +eaf1476a3bb29f6190bca660e6abef16 libmng-1.0.10.tar.bz2 Added: csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch =================================================================== --- csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch (rev 0) +++ csw/mgar/pkg/libmng/trunk/files/0001-Do-not-use-AM_C_PROTOTYPES-any-more.patch 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1,24 @@ +From 3c71ed89f828e91881b75182ab90c4d9f8eaf8a6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 5 Jun 2013 11:16:31 +0200 +Subject: [PATCH] Do not use AM_C_PROTOTYPES any more + +--- + makefiles/configure.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/makefiles/configure.in b/makefiles/configure.in +index e7cb75c..2407191 100644 +--- a/makefiles/configure.in ++++ b/makefiles/configure.in +@@ -15,7 +15,6 @@ AC_SUBST(VERSION) + dnl Checks for programs. + AC_PROG_CC + AC_ISC_POSIX +-AM_C_PROTOTYPES + if test "x$U" != "x"; then + AC_MSG_ERROR(Compiler not ANSI compliant) + fi +-- +1.8.1.4 + Added: csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch =================================================================== --- csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch (rev 0) +++ csw/mgar/pkg/libmng/trunk/files/libmng-automake.patch 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1,38 @@ +--- libmng-1.0.10/makefiles/Makefile.am.orig 2004-09-18 09:39:43.000000000 +0200 ++++ libmng-1.0.10/makefiles/Makefile.am 2007-07-16 19:43:07.285858201 +0200 +@@ -2,8 +2,10 @@ + + AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies + ++SUBDIRS = doc ++ + # include the app subdirectories in the distribution +-EXTRA_DIST = makefiles doc contrib ++EXTRA_DIST = makefiles contrib + + + # libmng release @VERSION@ +--- libmng-1.0.10/makefiles/configure.in.orig 2005-01-30 11:28:00.000000000 +0100 ++++ libmng-1.0.10/makefiles/configure.in 2007-07-16 19:43:24.774854842 +0200 +@@ -189,5 +189,5 @@ + + test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags + +-AC_CONFIG_FILES([Makefile]) ++ AC_CONFIG_FILES([Makefile doc/Makefile doc/man/Makefile]) + AC_OUTPUT +diff -Nru libmng-1.0.5.orig/doc/makefiles/Makefile.am libmng-1.0.5/doc/makefiles/Makefile.am +--- libmng-1.0.5.orig/doc/makefiles/Makefile.am Thu Jan 1 01:00:00 1970 ++++ libmng-1.0.5/doc/makefiles/Makefile.am Tue Mar 4 09:25:11 2003 +@@ -0,0 +1,4 @@ ++## Process this file with automake to produce Makefile.in ++ ++SUBDIRS = man ++ +diff -Nru libmng-1.0.5.orig/doc/man/makefiles/Makefile.am libmng-1.0.5/doc/man/makefiles/Makefile.am +--- libmng-1.0.5.orig/doc/man/makefiles/Makefile.am Thu Jan 1 01:00:00 1970 ++++ libmng-1.0.5/doc/man/makefiles/Makefile.am Tue Mar 4 09:25:11 2003 +@@ -0,0 +1,3 @@ ++## Process this file with automake to produce Makefile.in ++ ++man_MANS = libmng.3 jng.5 mng.5 Added: csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch =================================================================== --- csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch (rev 0) +++ csw/mgar/pkg/libmng/trunk/files/libmng-gcc4.patch 2013-06-05 09:54:01 UTC (rev 21276) @@ -0,0 +1,28 @@ +GCC-4 fix: + +mng.c: In function 'copyline': +mng.c:233: error: invalid lvalue in increment +mng.c:270: error: invalid lvalue in increment + +--- libmng-1.0.10/contrib/gcc/fbmngplay/mng.c.orig 2003-12-07 10:45:15.000000000 +0100 ++++ libmng-1.0.10/contrib/gcc/fbmngplay/mng.c 2007-07-16 19:47:18.272161096 +0200 +@@ -230,7 +230,8 @@ + a = a * mymng->alpha / 100; + switch (mymng->fbbpp) { + case 16: +- input = *((unsigned short *) background)++; ++ input = *(unsigned short *)background; ++ background += 2; + br = (input >> 8) & 0xf8; + bg = (input >> 3) & 0xfc; + bb = input << 3 & 0xff; +@@ -267,7 +268,8 @@ + b >>= 3; + + output = (r << 11) | (g << 5) | b; +- *((unsigned short *) dest)++ = output; ++ *(unsigned short *)dest = output; ++ dest += 2; + break; + case 24: + *dest++ = b; 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 Jun 5 12:04:39 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jun 2013 10:04:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21277] csw/mgar/pkg/ghostscript/branches Message-ID: Revision: 21277 http://gar.svn.sourceforge.net/gar/?rev=21277&view=rev Author: dmichelsen Date: 2013-06-05 10:04:39 +0000 (Wed, 05 Jun 2013) Log Message: ----------- ghostscript: Make new branch for libgs8 Added Paths: ----------- csw/mgar/pkg/ghostscript/branches/libgs8/ csw/mgar/pkg/ghostscript/branches/libgs8/Makefile csw/mgar/pkg/ghostscript/branches/libgs8/files/LICENSE csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-i386 csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparc csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparcv8plus+vis2 Removed Paths: ------------- csw/mgar/pkg/ghostscript/branches/libgs8/Makefile csw/mgar/pkg/ghostscript/branches/libgs8/files/0001-Support-libjpeg7.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0002-Rearrange-compiler-flags.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0003-Change-gcc-flags-to-sun.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0004-PLATFORM-is-used-by-GAR.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0005-Fix-pathes-according-to-old-package.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0006-Fix-dynamic-link-flag.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-Do-not-return-something-in-void-context.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-libidn-needs-L-opt-csw-lib.patch csw/mgar/pkg/ghostscript/branches/libgs8/files/0008-Wrong-place-in-configure.patch Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/Makefile 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,100 +0,0 @@ -# $Id$ - -NAME = ghostscript -VERSION = 9.07 -GARTYPE = v2 - -DESCRIPTION = PostScript and PDF interpreter -define BLURB -endef - -MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 - -PACKAGES = CSWghostscript -SPKG_DESC_CSWgs = PostScript and PDF interpreter - -RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgs += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWgs += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWgs += CSWlibcupsimage2 -RUNTIME_DEP_PKGS_CSWgs += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWgs += CSWlibk5crypto3 - -RUNTIME_DEP_PKGS_CSWgs += CSWfconfig -RUNTIME_DEP_PKGS_CSWgs += CSWgnutls -RUNTIME_DEP_PKGS_CSWgs += CSWgtk2 -RUNTIME_DEP_PKGS_CSWgs += CSWjpeg -RUNTIME_DEP_PKGS_CSWgs += CSWpango -RUNTIME_DEP_PKGS_CSWgs += CSWperl -RUNTIME_DEP_PKGS_CSWgs += CSWgsfonts -RUNTIME_DEP_PKGS_CSWgs += CSWjbig2dec - -# I'm dubious about this one. Maybe unnecessary? -# RUNTIME_DEP_PKGS_CSWgs += CSWlibcairo - -CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWperl -# Fonts are definitely necessary. -CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWgsfonts - -# Only docs and man pages. -CHECKPKG_OVERRIDES_CSWgs += file-with-bad-content -# Historical reasons. -CHECKPKG_OVERRIDES_CSWgs += catalogname-does-not-match-pkgname|pkgname=CSWgs|catalogname=ghostscript|expected-catalogname=gs - -# Pending release of libpaper -#RUNTIME_DEP_PKGS_CSWgs += CSWlibpaper - -# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc -# CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx - -OSOLETED_BY_CSWghostscript += CSWgs -CATALOGNAME_CSWgs = ghostscript_stub - -VENDOR_URL = http://www.ghostscript.com - -LICENSE = LICENSE - -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)= -UPSTREAM_USE_SF = 1 - -## PATCHFILES += 0001-Support-libjpeg7.patch -#PATCHFILES += 0002-Rearrange-compiler-flags.patch -#PATCHFILES += 0003-Change-gcc-flags-to-sun.patch -## PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch -#PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch -## PATCHFILES += 0006-Fix-dynamic-link-flag.patch -#PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch -#PATCHFILES += 0008-Wrong-place-in-configure.patch - -# Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so -# libcom_err.so libkrb5support.so are 64-bit - -# EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx - -EXTRA_CFLAGS += $(LINKER_FLAGS) - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-dynamic -CONFIGURE_ARGS += --enable-cups -CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts - -# This fails due to ghostscript using PLATFORM for internal use which gets set -# by GAR -#TEST_TARGET = - -include gar/category.mk - -# BUILD_ARGS = std so -# INSTALL_ARGS = install install-so - -# Use CSW build packages instead of bundled stuff -#pre-configure: -# @(echo "~~~ Removing bundled binaries ~~~") -# rm -rf $(WORKSRC)/jpeg -# rm -rf $(WORKSRC)/jbig2dec -# rm -rf $(WORKSRC)/jasper Copied: csw/mgar/pkg/ghostscript/branches/libgs8/Makefile (from rev 21231, csw/mgar/pkg/ghostscript/trunk/Makefile) =================================================================== --- csw/mgar/pkg/ghostscript/branches/libgs8/Makefile (rev 0) +++ csw/mgar/pkg/ghostscript/branches/libgs8/Makefile 2013-06-05 10:04:39 UTC (rev 21277) @@ -0,0 +1,65 @@ +# $Id$ + +NAME = ghostscript +VERSION = 8.71 +GARTYPE = v2 + +DESCRIPTION = PostScript and PDF interpreter +define BLURB +endef + +DISTFILES += libgs.so.8.71-i386 +DISTFILES += libgs.so.8.71-sparc +DISTFILES += libgs.so.8.71-sparcv8plus+vis2 +DISTFILES += LICENSE + +VENDOR_URL = http://www.ghostscript.com + +LICENSE = LICENSE + +# Legacy lib still in use +PACKAGES += CSWlibgs8 +SPKG_DESC_CSWlibgs8 = Ghostscript library, libgs.so.8 +PKGFILES_CSWlibgs8 += $(call pkgfiles_lib,libgs.so.8) +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWsunmath +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibjbig2dec0 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgs8 += CSWlibk5crypto3 + +# This is old and we won't change it any more +CHECKPKG_OVERRIDES_CSWlibgs8 += no-direct-binding +CHECKPKG_OVERRIDES_CSWlibgs8 += file-with-bad-content + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = + +include gar/category.mk + +post-install-isa-sparcv8plus: + ginstall -d $(DESTDIR)$(libdir) + ginstall -m 0644 $(WORKDIR)/libgs.so.8.71-sparc $(DESTDIR)$(libdir)/libgs.so.8.71 + gln -s libgs.so.8.71 $(DESTDIR)$(libdir)/libgs.so.8 + ginstall -d $(DESTDIR)$(libdir)/sparcv8plus+vis2 + ginstall -m 0644 $(WORKDIR)/libgs.so.8.71-sparcv8plus+vis2 $(DESTDIR)$(libdir)/sparcv8plus+vis2/libgs.so.8.71 + gln -s libgs.so.8.71 $(DESTDIR)$(libdir)/sparcv8plus+vis2/libgs.so.8 + @$(MAKECOOKIE) + +post-install-isa-pentium_pro: + ginstall -d $(DESTDIR)$(libdir) + ginstall -m 0644 $(WORKDIR)/libgs.so.8.71-i386 $(DESTDIR)$(libdir)/libgs.so.8.71 + gln -s libgs.so.8.71 $(DESTDIR)$(libdir)/libgs.so.8 + @$(MAKECOOKIE) + + Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0001-Support-libjpeg7.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Support-libjpeg7.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0001-Support-libjpeg7.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,14 +0,0 @@ ---- ghostscript-8.70.orig/jpeg/jcinit.c 2010-01-09 03:15:02.698411311 +0100 -+++ ghostscript-8.70/jpeg/jcinit.c 2010-01-09 03:46:28.021317069 +0100 -@@ -42,7 +42,11 @@ - jinit_forward_dct(cinfo); - /* Entropy encoding: either Huffman or arithmetic coding. */ - if (cinfo->arith_code) { -+#ifdef JERR_ARITH_NOTIMPL - ERREXIT(cinfo, JERR_ARITH_NOTIMPL); -+#else -+ jinit_arith_encoder(cinfo); -+#endif - } else { - if (cinfo->progressive_mode) { - #ifdef C_PROGRESSIVE_SUPPORTED Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0002-Rearrange-compiler-flags.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0002-Rearrange-compiler-flags.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0002-Rearrange-compiler-flags.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,23 +0,0 @@ ---- ghostscript-8.70.orig/base/jasper.mak 2008-04-11 00:08:20.000000000 +0200 -+++ ghostscript-8.70/base/jasper.mak 2010-01-09 06:04:15.251525415 +0100 -@@ -159,7 +159,8 @@ - $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D) - - # define our specific compiler --JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) -+#JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) -+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_) $(CFLAGS) - JASO_=$(O_)$(JASOBJ) - - # switch in the selected .dev ---- ghostscript-8.70.orig/base/lib.mak 2009-07-22 23:09:42.000000000 +0200 -+++ ghostscript-8.70/base/lib.mak 2010-01-09 06:15:47.023956040 +0100 -@@ -30,7 +30,7 @@ - GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) - GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) - GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) --GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) -+GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) $(CFLAGS) - GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) - GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) - GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0003-Change-gcc-flags-to-sun.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0003-Change-gcc-flags-to-sun.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0003-Change-gcc-flags-to-sun.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,24 +0,0 @@ ---- /home/hson/tmp/ghostscript-8.70/base/devs.mak 2009-02-14 01:46:58.000000000 +0100 -+++ ghostscript-8.70/base/devs.mak 2010-01-09 06:42:04.053689304 +0100 -@@ -418,10 +418,10 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)lvga256.so : $(lvga256_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl - - $(GLOBJ)vgalib.so : $(vgalib_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl - - ### -------------------------- The X11 device -------------------------- ### - -@@ -524,7 +524,7 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)X11.so : $(x11alt_) $(x11_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) -+ $(CCLD) $(LDFLAGS) -G -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) - - ###### --------------- Memory-buffered printer devices --------------- ###### - Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0004-PLATFORM-is-used-by-GAR.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0004-PLATFORM-is-used-by-GAR.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0004-PLATFORM-is-used-by-GAR.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,116 +0,0 @@ -diff -Nru ghostscript-8.70.orig/base/gs.mak ghostscript-8.70/base/gs.mak ---- ghostscript-8.70.orig/base/gs.mak 2009-01-27 21:43:37.000000000 +0100 -+++ ghostscript-8.70/base/gs.mak 2010-01-10 23:24:54.511788159 +0100 -@@ -363,7 +363,7 @@ - FEATURE_DEVS_EXTRA= - DEVICE_DEVS_EXTRA= - --DEVS_ALL=$(GLGENDIR)$(D)$(PLATFORM).dev\ -+DEVS_ALL=$(GLGENDIR)$(D)$(BUILD_PLATFORM).dev\ - $(FEATURE_DEVS) $(FEATURE_DEVS_EXTRA) \ - $(DEVICE_DEVS) $(DEVICE_DEVS1) \ - $(DEVICE_DEVS2) $(DEVICE_DEVS3) $(DEVICE_DEVS4) $(DEVICE_DEVS5) \ -@@ -375,7 +375,7 @@ - - devs_tr=$(GLGENDIR)$(D)devs.tr - $(devs_tr) : $(GS_MAK) $(TOP_MAKEFILES) $(ECHOGS_XE) -- $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(PLATFORM) -+ $(EXP)$(ECHOGS_XE) -w $(devs_tr) - -include $(GLGENDIR)$(D)$(BUILD_PLATFORM) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(FEATURE_DEVS_EXTRA) - $(EXP)$(ECHOGS_XE) -a $(devs_tr) -+ $(DEVICE_DEVS) -diff -Nru ghostscript-8.70.orig/base/macos-mcp.mak ghostscript-8.70/base/macos-mcp.mak ---- ghostscript-8.70.orig/base/macos-mcp.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/macos-mcp.mak 2010-01-10 23:25:55.154224777 +0100 -@@ -75,7 +75,7 @@ - - # Define the platform name. - --PLATFORM=macos_ -+BUILD_PLATFORM=macos_ - - - # don't use any shared libraries, they are compiled into the Ghostscript Lib -@@ -267,7 +267,7 @@ - include $(GLSRCDIR)/unixhead.mak - - # Redefine the platform name before going on --PLATFORM=macos_ -+BUILD_PLATFORM=macos_ - - include $(GLSRCDIR)/gs.mak - # psromfs.mak must precede lib.mak -diff -Nru ghostscript-8.70.orig/base/msvclib.mak ghostscript-8.70/base/msvclib.mak ---- ghostscript-8.70.orig/base/msvclib.mak 2008-08-29 01:16:39.000000000 +0200 -+++ ghostscript-8.70/base/msvclib.mak 2010-01-10 23:26:01.887097616 +0100 -@@ -445,7 +445,7 @@ - - LIB_ONLY=$(GLOBJDIR)\gslib.obj $(GLOBJDIR)\gsnogc.obj $(GLOBJDIR)\gconfig.obj $(GLOBJDIR)\gscdefs.obj $(GLOBJDIR)\gsromfs$(COMPILE_INITS).obj - MAKEDLL=0 --PLATFORM=mslib32_ -+BUILD_PLATFORM=mslib32_ - - !include $(GLSRCDIR)\version.mak - !include $(GLSRCDIR)\msvccmd.mak -diff -Nru ghostscript-8.70.orig/base/openvms.mak ghostscript-8.70/base/openvms.mak ---- ghostscript-8.70.orig/base/openvms.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/openvms.mak 2010-01-10 23:25:36.911773955 +0100 -@@ -270,7 +270,7 @@ - - # Define the platform name. - --PLATFORM=openvms_ -+BUILD_PLATFORM=openvms_ - - # Define the name of the makefile -- used in dependencies. - -diff -Nru ghostscript-8.70.orig/base/openvms.mmk ghostscript-8.70/base/openvms.mmk ---- ghostscript-8.70.orig/base/openvms.mmk 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/openvms.mmk 2010-01-10 23:25:27.461102799 +0100 -@@ -298,7 +298,7 @@ - - # Define the platform name. - --PLATFORM=openvms_ -+BUILD_PLATFORM=openvms_ - - # Define the name of the makefile -- used in dependencies. - -diff -Nru ghostscript-8.70.orig/base/unixhead.mak ghostscript-8.70/base/unixhead.mak ---- ghostscript-8.70.orig/base/unixhead.mak 2007-12-31 19:07:59.000000000 +0100 -+++ ghostscript-8.70/base/unixhead.mak 2010-01-10 23:22:33.391601312 +0100 -@@ -21,7 +21,7 @@ - # Define the platform name. For a "stock" System V platform, - # use sysv_ instead of unix_. - --PLATFORM=unix_ -+BUILD_PLATFORM=unix_ - - # Define the syntax for command, object, and executable files. - -diff -Nru ghostscript-8.70.orig/base/watclib.mak ghostscript-8.70/base/watclib.mak ---- ghostscript-8.70.orig/base/watclib.mak 2009-01-08 10:17:18.000000000 +0100 -+++ ghostscript-8.70/base/watclib.mak 2010-01-10 23:25:03.490859364 +0100 -@@ -115,7 +115,7 @@ - SYNC=winsync - !endif - --PLATFORM=watclib_ -+BUILD_PLATFORM=watclib_ - MAKEFILE=$(GLSRCDIR)\watclib.mak - TOP_MAKEFILES=$(MAKEFILE) $(GLSRCDIR)\wccommon.mak - PLATOPT= -diff -Nru ghostscript-8.70.orig/base/winlib.mak ghostscript-8.70/base/winlib.mak ---- ghostscript-8.70.orig/base/winlib.mak 2009-02-21 21:59:34.000000000 +0100 -+++ ghostscript-8.70/base/winlib.mak 2010-01-10 23:25:12.830496306 +0100 -@@ -28,8 +28,8 @@ - - # Define the platform name. - --!ifndef PLATFORM --PLATFORM=mswin32_ -+!ifndef BUILD_PLATFORM -+BUILD_PLATFORM=mswin32_ - !endif - - # Define the auxiliary program dependency. We use this to Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0005-Fix-pathes-according-to-old-package.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0005-Fix-pathes-according-to-old-package.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0005-Fix-pathes-according-to-old-package.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,27 +0,0 @@ ---- ../../../work.old/solaris8-sparc/build-isa-sparcv8/ghostscript-8.70.orig/Makefile.in 2009-05-22 01:46:45.000000000 +0200 -+++ ghostscript-8.70/Makefile.in 2010-01-11 04:36:20.575145752 +0100 -@@ -67,11 +67,11 @@ - # The following must be substituted using @datadir@ and @libdir@ - # to avoid adding RPM generation paths (CUPS STR #1112) - gsdir = @datadir@/ghostscript --gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -+gsdatadir = $(gsdir) - gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION) - gsincludedir = @includedir@/ghostscript/ - --docdir=$(gsdatadir)/doc -+docdir=$(gsdir)/doc/ghostscript - exdir=$(gsdatadir)/examples - GS_DOCDIR=$(docdir) - -@@ -342,8 +342,8 @@ - RM=rm -f - - # ------ Dynamic loader options ------- # --SOC_CFLAGS = @SOC_CFLAGS@ --SOC_LIBS = @SOC_LIBS@ -+SOC_CFLAGS = -I/opt/csw/X11/include @SOC_CFLAGS@ -+SOC_LIBS = -L/opt/csw/X11/lib @SOC_LIBS@ - SOC_LOADER = @SOC_LOADER@ - - Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0006-Fix-dynamic-link-flag.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0006-Fix-dynamic-link-flag.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0006-Fix-dynamic-link-flag.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,11 +0,0 @@ ---- ghostscript-8.70.orig/base/unix-dll.mak 2008-09-13 22:22:25.000000000 +0200 -+++ ghostscript-8.70/base/unix-dll.mak 2010-01-11 03:00:54.165762459 +0100 -@@ -49,7 +49,7 @@ - GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) - GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) - GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) --LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) -+LDFLAGS_SO=-G -h$(GS_SONAME_MAJOR) - - # MacOS X - #GS_SOEXT=dylib Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-Do-not-return-something-in-void-context.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-Do-not-return-something-in-void-context.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,30 +0,0 @@ -From fd8d878d5f1bdb7a49dbdfd220e6c7f3525743e1 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 17 May 2011 16:51:09 +0200 -Subject: [PATCH] Do not return something in void context - ---- - base/gdevdrop.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/base/gdevdrop.c b/base/gdevdrop.c -index fc52ebe..50a315b 100644 ---- a/base/gdevdrop.c -+++ b/base/gdevdrop.c -@@ -408,9 +408,11 @@ pack_planar_from_standard(gx_device_memory * dev, int y, int destx, - const byte *sp = src; - int x, plane; - -- if (pdepth == 1 && dev->color_info.num_components == 4) -- return pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width, -+ if (pdepth == 1 && dev->color_info.num_components == 4) { -+ pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width, - depth, src_depth); -+ return; -+ } - - for (plane = 0; plane < dev->num_planes; plane++) { - byte *dest = scan_line_base(dev, y + plane * dev->height); --- -1.7.3.2 - Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-libidn-needs-L-opt-csw-lib.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0007-libidn-needs-L-opt-csw-lib.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0007-libidn-needs-L-opt-csw-lib.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,25 +0,0 @@ -From ded20c08df2aee8ab5cc43cbe2287784c7f82162 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 2 Feb 2012 14:43:12 +0100 -Subject: [PATCH] libidn needs -L/opt/csw/lib - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 9ccd15d..ecd8317 100755 ---- a/configure -+++ b/configure -@@ -5116,7 +5116,7 @@ if test "${ac_cv_lib_idn_stringprep+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lidn $LIBS" -+LIBS="-L/opt/csw/lib -lidn $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --- -1.7.8.3 - Deleted: csw/mgar/pkg/ghostscript/branches/libgs8/files/0008-Wrong-place-in-configure.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0008-Wrong-place-in-configure.patch 2013-04-28 18:23:29 UTC (rev 20894) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/0008-Wrong-place-in-configure.patch 2013-06-05 10:04:39 UTC (rev 21277) @@ -1,25 +0,0 @@ -From f44f599849020abd2cbff12de84f36e4087316f6 Mon Sep 17 00:00:00 2001 -From: Maciej Blizinski -Date: Thu, 2 Feb 2012 14:56:52 +0100 -Subject: [PATCH] Wrong place in configure - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index ecd8317..e98175e 100755 ---- a/configure -+++ b/configure -@@ -5170,7 +5170,7 @@ HAVE_LIBIDN='' - UTF8DEVS='' - if test x$with_libidn != xno; then - HAVE_LIBIDN=-DHAVE_LIBIDN -- LIBS="$LIBS -lidn" -+ LIBS="$LIBS -L/opt/csw/lib -lidn" - - if test x$found_iconv != xno; then - UTF8DEVS='$(PSD)utf8.dev' --- -1.7.8.3 - Added: csw/mgar/pkg/ghostscript/branches/libgs8/files/LICENSE =================================================================== --- csw/mgar/pkg/ghostscript/branches/libgs8/files/LICENSE (rev 0) +++ csw/mgar/pkg/ghostscript/branches/libgs8/files/LICENSE 2013-06-05 10:04:39 UTC (rev 21277) @@ -0,0 +1,59 @@ +The files in the base, psi, lib, toolbin, examples, doc and man +directories (folders) and any subdirectories (sub-folders) +thereof are part of GPL Ghostscript. + +The files in the Resource directory and any subdirectories thereof +are also part of GPL Ghostscript, with the explicit exception of +the files in the CMap subdirectory (except "Identity-UTF16-H", +which is part of GPL Ghostscript). The CMap files are copyright +Adobe Systems Incorporated and covered by a separate, Affero GPL +compatible license. + +The files under the jpegxr directory and any subdirectories +thereof are distributed under a no cost, open source license +granted by the ITU/ISO/IEC but it is not Affero GPL +compatible - see jpegxr/COPYRIGHT.txt for details. + +GPL Ghostscript is free software; you can redistribute it and/or +modify it under the terms the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 +of the License, or (at your option) any later version. + +GPL Ghostscript 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 +Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public +License along with this program so you can know your rights and +responsibilities. It should be in a file named doc/COPYING. If not, +write to the Free Software Foundation, Inc., 59 Temple Place Suite +330, Boston, MA 02111-1307, USA. + +--- + +GPL Ghostscript contains an implementation of techniques covered +by US Patents 5,055,942 and 5,917,614, and corresponding +international patents. These patents are licensed for use with +GPL Ghostscript under the following grant: + +Whereas, Raph Levien (hereinafter "Inventor") has obtained patent +protection for related technology (hereinafter "Patented +Technology"), Inventor wishes to aid the the GNU free software +project in achieving its goals, and Inventor also wishes to +increase public awareness of Patented Technology, Inventor hereby +grants a fully paid up, nonexclusive, royalty free license to +practice the patents listed below ("the Patents") if and only if +practiced in conjunction with software distributed under the +terms of any version of the GNU Affero General Public License as +published by the Free Software Foundation, 59 Temple Place, Suite +330, Boston, MA 02111. Inventor reserves all other rights, +including without limitation, licensing for software not +distributed under the GNU Affero General Public License. + +5055942 Photographic image reproduction device using digital +halftoning to screen images allowing adjustable coarseness + +5917614 Method and apparatus for error diffusion screening of +images with improved smoothness in highlight and shadow +regions Added: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-i386 ___________________________________________________________________ Added: svn:mime-type + application/x-sharedlib Added: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparc ___________________________________________________________________ Added: svn:mime-type + application/x-sharedlib Added: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparcv8plus+vis2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/ghostscript/branches/libgs8/files/libgs.so.8.71-sparcv8plus+vis2 ___________________________________________________________________ Added: svn:mime-type + application/x-sharedlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Wed Jun 5 12:08:43 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 05 Jun 2013 10:08:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21278] csw/mgar/pkg Message-ID: Revision: 21278 http://gar.svn.sourceforge.net/gar/?rev=21278&view=rev Author: lblume Date: 2013-06-05 10:08:43 +0000 (Wed, 05 Jun 2013) Log Message: ----------- scummvm-tools/trunk: Add scummvm-tools Added Paths: ----------- csw/mgar/pkg/scummvm-tools/ csw/mgar/pkg/scummvm-tools/Makefile csw/mgar/pkg/scummvm-tools/branches/ csw/mgar/pkg/scummvm-tools/tags/ csw/mgar/pkg/scummvm-tools/trunk/ csw/mgar/pkg/scummvm-tools/trunk/Makefile csw/mgar/pkg/scummvm-tools/trunk/checksums csw/mgar/pkg/scummvm-tools/trunk/files/ Added: csw/mgar/pkg/scummvm-tools/Makefile =================================================================== --- csw/mgar/pkg/scummvm-tools/Makefile (rev 0) +++ csw/mgar/pkg/scummvm-tools/Makefile 2013-06-05 10:08:43 UTC (rev 21278) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/scummvm-tools/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/scummvm-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/Makefile 2013-06-05 10:08:43 UTC (rev 21278) @@ -0,0 +1,21 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scummvm-tools +VERSION = 1.6.0 +GARTYPE = v2 + +DESCRIPTION = ScummVM tools -- unsupported tools for ScummVM +define BLURB + ScummVM tools are additional programs to manipulate game files, extract da +ta, recompress audio. +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = scummvm +DISTFILES = $(DISTNAME).zip + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/scummvm-tools/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scummvm-tools/trunk/checksums =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/checksums (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/checksums 2013-06-05 10:08:43 UTC (rev 21278) @@ -0,0 +1 @@ +0997d5898ef0ad4ce799fb614f327c9a scummvm-tools-1.6.0.zip 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 Jun 5 13:59:03 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 05 Jun 2013 11:59:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21279] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21279 http://gar.svn.sourceforge.net/gar/?rev=21279&view=rev Author: slowfranklin Date: 2013-06-05 11:59:03 +0000 (Wed, 05 Jun 2013) Log Message: ----------- tracker/trunk: Move libs to seperate packages, fix deps Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 10:08:43 UTC (rev 21278) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 11:59:03 UTC (rev 21279) @@ -6,7 +6,7 @@ VERSION = 0.15.2 GARTYPE = v2 -DESCRIPTION = semantic data storage for desktop and mobile devices +DESCRIPTION = Gnome Tracker, semantic data storage define BLURB Tracker is a semantic data storage for desktop and mobile devices. Tracker uses W3C standards for RDF ontologies using Nepomuk with @@ -38,55 +38,87 @@ BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibuuid-dev -RUNTIME_DEP_PKGS += CSWlibuuid1 -RUNTIME_DEP_PKGS += CSWlibgsf -RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWggettext -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWgio-fam-backend -RUNTIME_DEP_PKGS += CSWlibiconv2 -RUNTIME_DEP_PKGS += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS += CSWlibxml2 -RUNTIME_DEP_PKGS += CSWlibz1 -RUNTIME_DEP_PKGS += CSWlibpoppler -RUNTIME_DEP_PKGS += CSWlibgif4 -RUNTIME_DEP_PKGS += CSWlibjpeg7 -RUNTIME_DEP_PKGS += CSWlibtiff3 -RUNTIME_DEP_PKGS += CSWlibicu46 -RUNTIME_DEP_PKGS += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-miner0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-extract0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-sparql0-16-0 PATCHFILES += 0001-Force-linking-with-CC-not-CXX.patch +PATCHFILES += 0002-strnlen-replacement-function.patch PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch # Packages -PACKAGES += CSWlibtracker0-16 -PACKAGES += CSWlibtracker-dev PACKAGES += CSWtracker +SPKG_DESC_CSWtracker = $(DESCRIPTION) -# Catalog names -CATALOGNAME_CSWlibtracker0-16 = libtracker0_16 -CATALOGNAME_CSWlibtracker-dev = libtracker_dev +PACKAGES += CSWlibtracker-extract0-16-0 +SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0 +PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0\.1502\.0) +PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0(\.\d+)*) -# Package descriptions -SPKG_DESC_CSWlibtracker0-16 = Gnome Tracker, libraries -SPKG_DESC_CSWlibtracker-dev = Gnome Tracker, development files -SPKG_DESC_CSWtracker = Gnome Tracker +PACKAGES += CSWlibtracker-miner0-16-0 +SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0 +PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0\.1502\.0) +PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0(\.\d+)*) -# Package payload -PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-extract-0.16.so) -PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-miner-0.16.so) -PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-sparql-0.16.so) -PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so) -PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so.*) -PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so.*) +PACKAGES += CSWlibtracker-sparql0-16-0 +SPKG_DESC_CSWlibtracker-sparql0-16-0 += $(DESCRIPTION), libtracker-sparql-0.16.so.0 +PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0) +PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*) -PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) +PACKAGES += CSWlibtracker0-16-dev +SPKG_DESC_CSWlibtracker0-16-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibtracker0-16-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-extract-0.16.so +PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-miner-0.16.so +PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-sparql-0.16.so +PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-common.so +PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-data.so -# Inter-package deps -RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker0-16 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker0-16 + # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch 2013-06-05 11:59:03 UTC (rev 21279) @@ -0,0 +1,65 @@ +From 514a5a199b799f240acf9275d54fe8210e0be284 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Wed, 5 Jun 2013 12:07:33 +0200 +Subject: [PATCH] strnlen replacement function + +--- + config.h.in | 3 +++ + configure | 10 ++++++++++ + src/libtracker-data/tracker-db-journal.c | 8 ++++++++ + 3 files changed, 21 insertions(+) + +diff --git a/config.h.in b/config.h.in +index dfdee13..4ee3de5 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -269,3 +269,6 @@ + + /* Defined for compilers not supporting __FUNCTION__ */ + #undef __FUNCTION__ ++ ++/* Define if we have strnlen */ ++#undef HAVE_STRNLEN +diff --git a/configure b/configure +index d124120..c3ca95f 100755 +--- a/configure ++++ b/configure +@@ -17385,6 +17385,16 @@ _ACEOF + fi + done + ++for ac_func in strnlen ++do : ++ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" ++if test "x$ac_cv_func_strnlen" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_STRNLEN 1 ++_ACEOF ++ ++fi ++done + + CFLAGS="$CFLAGS" + +diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c +index a664675..834933a 100644 +--- a/src/libtracker-data/tracker-db-journal.c ++++ b/src/libtracker-data/tracker-db-journal.c +@@ -120,6 +120,14 @@ static JournalWriter ontology_writer = {0}; + + static TransactionFormat current_transaction_format; + ++#ifndef HAVE_STRNLEN ++size_t strnlen (const char *str, size_t max) ++{ ++ const char *end = memchr (str, 0, max); ++ return end ? (size_t)(end - str) : max; ++} ++#endif ++ + #if GLIB_CHECK_VERSION (2, 24, 2) + static gboolean tracker_db_journal_rotate (GError **error); + #endif /* GLib check */ +-- +1.8.1.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 Jun 5 15:02:05 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jun 2013 13:02:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21280] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 21280 http://gar.svn.sourceforge.net/gar/?rev=21280&view=rev Author: dmichelsen Date: 2013-06-05 13:02:03 +0000 (Wed, 05 Jun 2013) Log Message: ----------- mGAR v2: Allow additional dependencies for obsoleted packages Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2013-06-05 11:59:03 UTC (rev 21279) +++ csw/mgar/gar/v2/gar.pkg.mk 2013-06-05 13:02:03 UTC (rev 21280) @@ -73,7 +73,7 @@ # The length of the description has been limited to 100 characters, # the string is cut (no longer on word boundaries). SPKG_DESC_$(1) ?= $(shell echo Transitional package. Content moved to $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) | perl -npe 's/(.{100}).+/substr($$1,0,96) . " ..."/e') -RUNTIME_DEP_PKGS_$(1) = $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) +RUNTIME_DEP_PKGS_$(1) += $(foreach P,$(OBSOLETING_PKGS),$(if $(filter $(1),$(OBSOLETED_BY_$P)),$P)) PKGFILES_$(1) ?= NOFILES ARCHALL_$(1) ?= 1 # For legacy packages we know that the dependency is correct because we deliberately set it This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 5 15:05:40 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jun 2013 13:05:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21281] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 21281 http://gar.svn.sourceforge.net/gar/?rev=21281&view=rev Author: dmichelsen Date: 2013-06-05 13:05:40 +0000 (Wed, 05 Jun 2013) Log Message: ----------- ghostscript/trunk: Add legacy dependency to libgs.so.8 Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-05 13:02:03 UTC (rev 21280) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-05 13:05:40 UTC (rev 21281) @@ -30,6 +30,8 @@ BUILD_DEP_PKGS += CSWlibpaper-dev BUILD_DEP_PKGS += CSWlibcairo2 +FOREIGN_PACKAGES += CSWlibgs8 + PACKAGES += CSWghostscript SPKG_DESC_CSWghostscript = PostScript and PDF interpreter RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgs9 @@ -67,6 +69,9 @@ # This was the old package OBSOLETED_BY_CSWghostscript += CSWgs CATALOGNAME_CSWgs = ghostscript_stub +# We need this as legacy packages still depend on CSWgs to include libgs.so.8 +RUNTIME_DEP_PKGS_CSWgs += CSWlibgs8 +CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWlibgs8 PACKAGES += CSWlibgs9 SPKG_DESC_CSWlibgs9 = Ghostscript library, libgs.so.9 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 Jun 5 17:32:43 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 05 Jun 2013 15:32:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21282] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21282 http://gar.svn.sourceforge.net/gar/?rev=21282&view=rev Author: slowfranklin Date: 2013-06-05 15:32:43 +0000 (Wed, 05 Jun 2013) Log Message: ----------- tracker/trunk: (Hopefully) Fix cyclic dependency by adding libtracker-common package Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 13:05:40 UTC (rev 21281) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 15:32:43 UTC (rev 21282) @@ -8,7 +8,7 @@ DESCRIPTION = Gnome Tracker, semantic data storage define BLURB - Tracker is a semantic data storage for desktop and mobile devices. + Tracker is a semantic data storage for desktop and mobile devices. Tracker uses W3C standards for RDF ontologies using Nepomuk with SPARQL to query and update the data. Tracker is a central repository of user information, that provides @@ -46,44 +46,56 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibicui18n51 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibicuuc51 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibuuid1 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common + RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibtracker-common + RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibexif12 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWtracker +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-common + RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-common + RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-miner0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWtracker RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-extract0-16-0 RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicuuc51 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibuuid1 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0 + PATCHFILES += 0001-Force-linking-with-CC-not-CXX.patch PATCHFILES += 0002-strnlen-replacement-function.patch PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch @@ -93,10 +105,18 @@ PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) +PACKAGES += CSWlibtracker-common +SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common +PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0\.1502\.0) +PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0\.1502\.0) +PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0(\.\d+)*) + PACKAGES += CSWlibtracker-extract0-16-0 SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0 PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0\.1502\.0) PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so) PACKAGES += CSWlibtracker-miner0-16-0 SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0 @@ -111,14 +131,14 @@ PACKAGES += CSWlibtracker0-16-dev SPKG_DESC_CSWlibtracker0-16-dev += $(DESCRIPTION), development files PKGFILES_CSWlibtracker0-16-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-extract-0.16.so -PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-miner-0.16.so -PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-sparql-0.16.so -PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-common.so -PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-data.so +PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so) +PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so) +PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so) +PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) +PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) +PKGFILES_CSWlibtracker0-16-dev += $(datadir)/glib-2\.0/schemas/org\.freedesktop\.Tracker.* +PKGFILES_CSWlibtracker0-16-dev += $(datadir)/vala/vapi/tracker-.* - - # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) @@ -130,7 +150,5 @@ CONFIGURE_ARGS += --disable-playlist CONFIGURE_ARGS += --disable-nautilus-extension -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 slowfranklin at users.sourceforge.net Wed Jun 5 18:54:44 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Wed, 05 Jun 2013 16:54:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21283] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21283 http://gar.svn.sourceforge.net/gar/?rev=21283&view=rev Author: slowfranklin Date: 2013-06-05 16:54:43 +0000 (Wed, 05 Jun 2013) Log Message: ----------- tracker/trunk: Tracker need dbus Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 15:32:43 UTC (rev 21282) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 16:54:43 UTC (rev 21283) @@ -50,6 +50,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0 @@ -104,6 +105,7 @@ # Packages PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) +CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common 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 Jun 5 21:26:13 2013 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 05 Jun 2013 19:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21284] csw/mgar/pkg/keychain/trunk Message-ID: Revision: 21284 http://gar.svn.sourceforge.net/gar/?rev=21284&view=rev Author: wahwah Date: 2013-06-05 19:26:12 +0000 (Wed, 05 Jun 2013) Log Message: ----------- keychain/trunk: version update, a new sed patch Modified Paths: -------------- csw/mgar/pkg/keychain/trunk/Makefile csw/mgar/pkg/keychain/trunk/checksums Added Paths: ----------- csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch Removed Paths: ------------- csw/mgar/pkg/keychain/trunk/files/gsed.patch Modified: csw/mgar/pkg/keychain/trunk/Makefile =================================================================== --- csw/mgar/pkg/keychain/trunk/Makefile 2013-06-05 16:54:43 UTC (rev 21283) +++ csw/mgar/pkg/keychain/trunk/Makefile 2013-06-05 19:26:12 UTC (rev 21284) @@ -3,7 +3,7 @@ # $Header$ NAME = keychain -VERSION = 2.7.0 +VERSION = 2.7.1 GARTYPE = v2 DESCRIPTION = Convenient ssh-agent and gpg-agent manager @@ -19,12 +19,13 @@ endef MASTER_SITES = http://www.funtoo.org/archive/keychain/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 + +PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc + PATCHFILES += bash.patch -PATCHFILES += gsed.patch +PATCHFILES += 0002-Allow-to-use-own-sed.patch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - ARCHALL = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = keychain @@ -34,6 +35,8 @@ RUNTIME_DEP_PKGS = CSWbash BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWperl +CHECKPKG_OVERRIDES_CSWkeychain += surplus-dependency|CSWbash + include gar/category.mk build-keychain: Modified: csw/mgar/pkg/keychain/trunk/checksums =================================================================== --- csw/mgar/pkg/keychain/trunk/checksums 2013-06-05 16:54:43 UTC (rev 21283) +++ csw/mgar/pkg/keychain/trunk/checksums 2013-06-05 19:26:12 UTC (rev 21284) @@ -1,3 +1 @@ -6485201fc090ad73b72971357e018d52 bash.patch -ad52a3ab14a63ccff22cac5076286bcb gsed.patch -c5eecd36130d9e8617a77f96b746982d keychain-2.7.0.tar.bz2 +07c622833192189f483cbaec287f9704 keychain-2.7.1.tar.bz2 Added: csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch (rev 0) +++ csw/mgar/pkg/keychain/trunk/files/0002-Allow-to-use-own-sed.patch 2013-06-05 19:26:12 UTC (rev 21284) @@ -0,0 +1,41 @@ +From 28bbb7e4d2f64efd28f186c3a7ca7b52b54380f9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 5 Jun 2013 21:20:37 +0200 +Subject: [PATCH] Allow to use own sed + +--- + Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 805ae63..00725b9 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,8 @@ + V:=$(shell cat VERSION) + D:=$(shell date +'%d %b %Y') ++ifndef SED ++SED = sed ++endif + TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ + keychain.spec + +@@ -14,13 +17,13 @@ clean: tmpclean + rm -rf keychain.1 keychain keychain.spec + + keychain.spec: keychain.spec.in keychain.sh +- sed 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec ++ $(SED) 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec + + keychain.1: keychain.pod keychain.sh + pod2man --name=keychain --release=$V \ + --center='http://www.funtoo.org' \ + keychain.pod keychain.1 +- sed -i.orig -e "s/^'br/.br/" keychain.1 ++ $(SED) -i.orig -e "s/^'br/.br/" keychain.1 + + keychain.1.gz: keychain.1 + gzip -9 keychain.1 +-- +1.7.10.3 + Deleted: csw/mgar/pkg/keychain/trunk/files/gsed.patch =================================================================== --- csw/mgar/pkg/keychain/trunk/files/gsed.patch 2013-06-05 16:54:43 UTC (rev 21283) +++ csw/mgar/pkg/keychain/trunk/files/gsed.patch 2013-06-05 19:26:12 UTC (rev 21284) @@ -1,27 +0,0 @@ ---- a/Makefile 2010-01-05 22:40:37.832643496 +0100 -+++ b/Makefile 2010-01-05 23:01:25.428084486 +0100 -@@ -1,19 +1,22 @@ - V:=$(shell /bin/sh keychain.sh --version 2>&1 | \ - awk -F'[ ;]' '/^K/{print $$2; exit}') - D:=$(shell date +'%d %b %Y') -+ifndef SED -+SED = sed -+endif - TARBALL_CONTENTS=keychain README.rst ChangeLog COPYING keychain.pod keychain.1 \ - keychain.spec - - all: keychain.1.gz keychain keychain.spec - - keychain.spec: keychain.spec.in keychain.sh -- sed 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec -+ $(SED) 's/KEYCHAIN_VERSION/$V/' keychain.spec.in > keychain.spec - - keychain.1: keychain.pod keychain.sh - pod2man --name=keychain --release=$V \ - --center='http://gentoo.org/proj/en/keychain.xml' \ - keychain.pod keychain.1 -- sed -i.orig -e "s/^'br/.br/" keychain.1 -+ $(SED) -i.orig -e "s/^'br/.br/" keychain.1 - - keychain.1.gz: keychain.1 - gzip -9 keychain.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jun 5 22:15:43 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Jun 2013 20:15:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21285] csw/mgar/pkg/gnutls/trunk/Makefile Message-ID: Revision: 21285 http://gar.svn.sourceforge.net/gar/?rev=21285&view=rev Author: chninkel Date: 2013-06-05 20:15:43 +0000 (Wed, 05 Jun 2013) Log Message: ----------- gnutls/trunk: add a workaround to make sure xtra libraries not liked against libgnutls28 Modified Paths: -------------- csw/mgar/pkg/gnutls/trunk/Makefile Modified: csw/mgar/pkg/gnutls/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls/trunk/Makefile 2013-06-05 19:26:12 UTC (rev 21284) +++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-06-05 20:15:43 UTC (rev 21285) @@ -36,11 +36,11 @@ PACKAGES += CSWlibgnutls26 CATALOGNAME_CSWlibgnutls = libgnutls26 SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26 -PKGFILES_CSWlibgnutls26 = $(PKGFILES_RT) +PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),[^/-]*\.so\.\d+(\.\d+)*) +PKGFILES_CSWlibgnutls26 += $(call baseisadirs,$(libdir),[^/-]*-extra\.so\.\d+(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibnettle4 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibgc1 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibhogweed2 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-6 @@ -62,8 +62,12 @@ # If defined with the default value, the test breaks # so we only keep the required items LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) +# Workaround to make sure gnutls26 extra libraries +# are linked against gnutls26 and not gnutls28 +LD_OPTIONS += -L$(abspath $(WORKSRC))/lib/.libs # We put all libs in one package as they are .so.26 and are all bumped together CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch 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 Wed Jun 5 22:18:34 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 05 Jun 2013 20:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21286] csw/mgar/pkg/gnutls/trunk/files/ 0004-workaround-certificate-expiration-issue-in-the-test-.patch Message-ID: Revision: 21286 http://gar.svn.sourceforge.net/gar/?rev=21286&view=rev Author: chninkel Date: 2013-06-05 20:18:33 +0000 (Wed, 05 Jun 2013) Log Message: ----------- gnutls/trunk: added missing patch Added Paths: ----------- csw/mgar/pkg/gnutls/trunk/files/0004-workaround-certificate-expiration-issue-in-the-test-.patch Added: csw/mgar/pkg/gnutls/trunk/files/0004-workaround-certificate-expiration-issue-in-the-test-.patch =================================================================== --- csw/mgar/pkg/gnutls/trunk/files/0004-workaround-certificate-expiration-issue-in-the-test-.patch (rev 0) +++ csw/mgar/pkg/gnutls/trunk/files/0004-workaround-certificate-expiration-issue-in-the-test-.patch 2013-06-05 20:18:33 UTC (rev 21286) @@ -0,0 +1,31 @@ +From f3bb6835113ec86c74ef645cc45b6794637b9886 Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Mon, 20 May 2013 21:21:09 +0200 +Subject: [PATCH] workaround certificate expiration issue in the test suite + +--- + tests/chainverify.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/chainverify.c b/tests/chainverify.c +index 151602e..6d90aea 100644 +--- a/tests/chainverify.c ++++ b/tests/chainverify.c +@@ -738,12 +738,12 @@ static struct + { "cacertrsamd5 fail", cacertrsamd5, &cacertrsamd5[2], + 0, GNUTLS_CERT_INSECURE_ALGORITHM | GNUTLS_CERT_INVALID }, + { "cacertrsamd5 ok", cacertrsamd5, &cacertrsamd5[2], +- GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5, 0 }, ++ GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5, GNUTLS_CERT_EXPIRED | GNUTLS_CERT_INVALID }, + { "cacertrsamd5 short-cut not ok", cacertrsamd5, &cacertrsamd5[0], + GNUTLS_VERIFY_DO_NOT_ALLOW_SAME, + GNUTLS_CERT_SIGNER_NOT_FOUND | GNUTLS_CERT_INVALID }, + { "cacertrsamd5 short-cut ok", cacertrsamd5, &cacertrsamd5[1], +- 0, 0 }, ++ 0, GNUTLS_CERT_EXPIRED | GNUTLS_CERT_INVALID }, + { NULL, NULL, NULL, 0, 0} + }; + /* *INDENT-ON* */ +-- +1.8.1.4 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu Jun 6 12:03:07 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 06 Jun 2013 10:03:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[21287] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21287 http://gar.svn.sourceforge.net/gar/?rev=21287&view=rev Author: slowfranklin Date: 2013-06-06 10:03:02 +0000 (Thu, 06 Jun 2013) Log Message: ----------- tracker/trunk: More required packages Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 20:18:33 UTC (rev 21286) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-06 10:03:02 UTC (rev 21287) @@ -51,6 +51,9 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWdbus +RUNTIME_DEP_PKGS_CSWtracker += CSWdconf +# for gsettings binary +RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0 @@ -106,6 +109,8 @@ PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus +CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf +CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common 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 Jun 6 12:50:05 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jun 2013 10:50:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21288] csw/mgar/pkg/ghostscript/trunk Message-ID: Revision: 21288 http://gar.svn.sourceforge.net/gar/?rev=21288&view=rev Author: dmichelsen Date: 2013-06-06 10:50:04 +0000 (Thu, 06 Jun 2013) Log Message: ----------- ghostscript/trunk: Add cups filters and fix #4913 Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-06 10:03:02 UTC (rev 21287) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-06 10:50:04 UTC (rev 21288) @@ -11,6 +11,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# See for details https://www.opencsw.org/mantis/view.php?id=4913 +PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch + VENDOR_URL = http://www.ghostscript.com LICENSE = LICENSE @@ -73,6 +76,26 @@ RUNTIME_DEP_PKGS_CSWgs += CSWlibgs8 CHECKPKG_OVERRIDES_CSWgs += surplus-dependency|CSWlibgs8 +# CUPS filter +PACKAGES += CSWghostscript-filters +SPKG_DESC_CSWghostscript-filters = CUPS filter for Ghostscript +PKGFILES_CSWghostscript-filters += $(libdir)/cups/.* +PKGFILES_CSWghostscript-filters += $(sysconfdir)/cups/.* +RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcupsimage2 +RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibdbus1-3 +CHECKPKG_OVERRIDES_CSWghostscript-filters += file-with-bad-content|/usr/share|root/opt/csw/lib/cups/filter/gstoraster +CHECKPKG_OVERRIDES_CSWghostscript-filters += file-with-bad-content|/usr/share|root/opt/csw/lib/cups/filter/gstopxl + +# Yes, the filter is 32 bit only +CHECKPKG_OVERRIDES_CSWghostscript-filters += 64-bit-binaries-missing + +# The filter gstopxl calls /opt/csw/bin/gs +RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWghostscript +CHECKPKG_OVERRIDES_CSWghostscript-filters += surplus-dependency|CSWghostscript + +PRESERVECONF += $(sysconfdir)/cups/gstoraster.convs + PACKAGES += CSWlibgs9 SPKG_DESC_CSWlibgs9 = Ghostscript library, libgs.so.9 PKGFILES_CSWlibgs9 += $(call pkgfiles_lib,libgs.so.9) @@ -93,6 +116,14 @@ PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 +REINPLACEMENTS += fontpath +REINPLACE_MATCH_fontpath = /usr/share/cups/fonts +REINPLACE_WITH_fontpath = $(sharedstatedir)/cups/fonts +REINPLACE_FILES_fontpath += cups/gstopxl.in + +# This is for cups/gstoraster.c which doesn't seem to honour --with-fontpath +EXTRA_CPPFLAGS += -DCUPS_FONTPATH=\\\"$(datadir)/ghostscript/fonts\\\" + BUILD64 = 1 ISAEXEC = 1 @@ -100,6 +131,7 @@ CONFIGURE_ARGS += --enable-dynamic CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS += --with-install-cups # pentium_pro does not have SSE2 and the detection does not work CONFIGURE_ARGS-32-i386 += --disable-sse2 Added: csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch (rev 0) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch 2013-06-06 10:50:04 UTC (rev 21288) @@ -0,0 +1,120 @@ +From 120c2d04e6e3693608a686bd56f5a71a7cf1a860 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 6 Jun 2013 11:55:38 +0200 +Subject: [PATCH] Use ksh and GNU sed as reported in #4913 + +--- + cups/gstopxl.in | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/cups/gstopxl.in b/cups/gstopxl.in +index 7c4fe88..4e5972b 100755 +--- a/cups/gstopxl.in ++++ b/cups/gstopxl.in +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/ksh + # + # + # CUPS PCL XL/PCL 6 filter script for Ghostscript. +@@ -50,9 +50,9 @@ ps_code= + ppd_opts= + + resolution= +-eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')" ++eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')" + if test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")" + fi + echo "DEBUG: Resolution: $resolution" >&2 + if test -n "$resolution"; then +@@ -60,15 +60,15 @@ if test -n "$resolution"; then + fi + + pagesize= +-eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')" ++eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')" + if test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")" + fi + echo "DEBUG: Page size: $pagesize" >&2 + width= + height= + if test -n "$pagesize" && test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")" + fi + echo "DEBUG: Width: $width, height: $height" >&2 + if test -n "$width"; then +@@ -83,7 +83,7 @@ bl_y= + tr_x= + tr_y= + if test -n "$pagesize" && test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")" + fi + echo "DEBUG: Absolute margins: $bl_x, $bl_y, $tr_x, $tr_y" >&2 + margin_l= +@@ -105,14 +105,14 @@ if test -n "$margin_l" && test -n "$margin_b" && \ + fi + + inputslot= +-eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')" ++eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')" + if test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")" + fi + echo "DEBUG: InputSlot: $inputslot" >&2 + inputslot_val= + if test -n "$inputslot" && test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")" + fi + echo "DEBUG: Value for MediaPosition: $inputslot_val" >&2 + if test -n "$inputslot_val"; then +@@ -120,9 +120,9 @@ if test -n "$inputslot_val"; then + fi + + colormodel= +-eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')" ++eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')" + if test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")" + fi + echo "DEBUG: ColorModel: $colormodel" >&2 + if test "$colormodel" = "Gray"; then +@@ -130,7 +130,7 @@ if test "$colormodel" = "Gray"; then + fi + colormodel_val= + if test -n "$colormodel" && test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")" + fi + echo "DEBUG: Value for BitsPerPixel: $colormodel_val" >&2 + if test -n "$colormodel_val"; then +@@ -138,15 +138,15 @@ if test -n "$colormodel_val"; then + fi + + duplex= +-eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')" ++eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')" + if test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")" + fi + echo "DEBUG: Duplex: $duplex" >&2 + duplex_val= + tumble_val= + if test -n "$duplex" && test -e "$PPD"; then +- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")" ++ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")" + fi + echo "DEBUG: Value for Duplex: $duplex_val; Value for Tumble: $tumble_val" >&2 + if test -n "$duplex_val"; then +-- +1.8.1.4 + 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 Jun 6 12:53:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jun 2013 10:53:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21289] csw/mgar/pkg/gsfonts/trunk/Makefile Message-ID: Revision: 21289 http://gar.svn.sourceforge.net/gar/?rev=21289&view=rev Author: dmichelsen Date: 2013-06-06 10:53:29 +0000 (Thu, 06 Jun 2013) Log Message: ----------- gsfonts/trunk: Add RFE Modified Paths: -------------- csw/mgar/pkg/gsfonts/trunk/Makefile Modified: csw/mgar/pkg/gsfonts/trunk/Makefile =================================================================== --- csw/mgar/pkg/gsfonts/trunk/Makefile 2013-06-06 10:50:04 UTC (rev 21288) +++ csw/mgar/pkg/gsfonts/trunk/Makefile 2013-06-06 10:53:29 UTC (rev 21289) @@ -1,6 +1,9 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # +# - Add fontmap as reported in https://www.opencsw.org/mantis/view.php?id=1029 +# /opt/csw/bin/libwmf-fontmap --map=$(DESTDIR)/fontmap $(DESTDIR)/opt/csw/share/ghostscript/fonts + NAME = gsfonts VERSION = 8.11 GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 6 13:25:48 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jun 2013 11:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21290] csw/mgar/pkg/ghostscript/trunk/Makefile Message-ID: Revision: 21290 http://gar.svn.sourceforge.net/gar/?rev=21290&view=rev Author: dmichelsen Date: 2013-06-06 11:25:47 +0000 (Thu, 06 Jun 2013) Log Message: ----------- ghostscript/trunk: Move PPDs to cups filter package Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-06 10:53:29 UTC (rev 21289) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2013-06-06 11:25:47 UTC (rev 21290) @@ -80,6 +80,7 @@ PACKAGES += CSWghostscript-filters SPKG_DESC_CSWghostscript-filters = CUPS filter for Ghostscript PKGFILES_CSWghostscript-filters += $(libdir)/cups/.* +PKGFILES_CSWghostscript-filters += $(sharedstatedir)/cups/.* PKGFILES_CSWghostscript-filters += $(sysconfdir)/cups/.* RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWghostscript-filters += CSWlibcups2 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 Jun 6 13:32:34 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jun 2013 11:32:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21291] csw/mgar/pkg/erlang/trunk/Makefile Message-ID: Revision: 21291 http://gar.svn.sourceforge.net/gar/?rev=21291&view=rev Author: dmichelsen Date: 2013-06-06 11:32:33 +0000 (Thu, 06 Jun 2013) Log Message: ----------- erlang/trunk: Fix amd64 Modified Paths: -------------- csw/mgar/pkg/erlang/trunk/Makefile Modified: csw/mgar/pkg/erlang/trunk/Makefile =================================================================== --- csw/mgar/pkg/erlang/trunk/Makefile 2013-06-06 11:25:47 UTC (rev 21290) +++ csw/mgar/pkg/erlang/trunk/Makefile 2013-06-06 11:32:33 UTC (rev 21291) @@ -40,6 +40,9 @@ # This is just for the emacs style CHECKPKG_OVERRIDES_CSWerlang += missing-dependency|CSWemacs-common +# Don't care for now +CHECKPKG_OVERRIDES_CSWerlang += no-direct-binding|/opt/csw/lib/amd64/erlang/lib/runtime_tools-1.8.10/priv/lib/trace_ip_drv.so|is|not|directly|bound|to|soname|libdlpi.so.1 +CHECKPKG_OVERRIDES_CSWerlang += no-direct-binding|/opt/csw/lib/amd64/erlang/lib/runtime_tools-1.8.10/priv/lib/trace_ip_drv.so|is|not|directly|bound|to|soname|libsendfile.so.1 PACKAGES += CSWerlang-dev SPKG_DESC_CSWerlang-dev = Ericson Erlang OTP library sources and headers @@ -108,4 +111,5 @@ # The -m32 -march=pentium_pro disturbs ld which just takes -32 ARCHFLAGS_GCC4_pentium_pro := +ARCHFLAGS_GCC4_amd64 := 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 Jun 6 14:23:30 2013 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 06 Jun 2013 12:23:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21292] csw/mgar/pkg/texlive/trunk/Makefile Message-ID: Revision: 21292 http://gar.svn.sourceforge.net/gar/?rev=21292&view=rev Author: pfelecan Date: 2013-06-06 12:23:28 +0000 (Thu, 06 Jun 2013) Log Message: ----------- texlive/trunk: take into account the transition from gs to ghostscript packages Modified Paths: -------------- csw/mgar/pkg/texlive/trunk/Makefile Modified: csw/mgar/pkg/texlive/trunk/Makefile =================================================================== --- csw/mgar/pkg/texlive/trunk/Makefile 2013-06-06 11:32:33 UTC (rev 21291) +++ csw/mgar/pkg/texlive/trunk/Makefile 2013-06-06 12:23:28 UTC (rev 21292) @@ -42,6 +42,7 @@ BUILD_DEP_PKGS += CSWlibfreetype-dev BUILD_DEP_PKGS += CSWlibgd-dev BUILD_DEP_PKGS += CSWclisp +BUILD_DEP_PKGS += CSWghostscript-dev # when this is installed, raises undefined symbols when linking # tools/genrb; this is the reason form 0002-Fix-ICU-link-edit.patch # BUILD_DEP_PKGS += CSWlibicu-dev @@ -633,7 +634,7 @@ PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xetex PKGFILES_CSWtexlive-binaries += /opt/csw/bin/xmltex RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWgs +RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWlibgs9 RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWgsfonts CHECKPKG_OVERRIDES_CSWtexlive-binaries += surplus-dependency|CSWgsfonts RUNTIME_DEP_PKGS_CSWtexlive-binaries += CSWtexlive-common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Thu Jun 6 14:46:43 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 06 Jun 2013 12:46:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21293] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21293 http://gar.svn.sourceforge.net/gar/?rev=21293&view=rev Author: slowfranklin Date: 2013-06-06 12:46:42 +0000 (Thu, 06 Jun 2013) Log Message: ----------- glib2/trunk: Add build dep CSWlibz-dev Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-06-06 12:23:28 UTC (rev 21292) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-06-06 12:46:42 UTC (rev 21293) @@ -272,6 +272,7 @@ BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo # This is used to adjust paths in documentation BUILD_DEP_PKGS += CSWgsed +BUILD_DEP_PKGS += CSWlibz-dev # -xO4 is necessary on sparc so that function inlining happens as expected EXTRA_CFLAGS_sparc = -xO4 -features=extensions -xc99 -D_XPG6 # -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 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 Jun 7 09:57:06 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Jun 2013 07:57:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21294] csw/mgar/pkg/wxwidgets/branches Message-ID: Revision: 21294 http://gar.svn.sourceforge.net/gar/?rev=21294&view=rev Author: dmichelsen Date: 2013-06-07 07:56:54 +0000 (Fri, 07 Jun 2013) Log Message: ----------- wxwidgets: Create new branch wxwidgets-2.9.3 Modified Paths: -------------- csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/Makefile csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/checksums csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/Makefile csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/ Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-05 20:18:33 UTC (rev 21286) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/Makefile 2013-06-07 07:56:54 UTC (rev 21294) @@ -3,7 +3,7 @@ # $Id$ NAME = wxWidgets -VERSION = 2.8.10 +VERSION = 2.9.3 GARTYPE = v2 define BLURB wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, @@ -13,24 +13,15 @@ the platform's own native controls rather than emulating them. endef -# The unicode version can't be currently built on Solaris 8. Doing separate -# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. -# More details below, look for 'unicode'. -# PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +SF_PROJ = wxwindows +MASTER_SITES += $(SF_MIRRORS) -EXTRA_MODULATORS = VERSION +DESCRIPTION = WX Widgets Cross-Platform GUI Library +DISTFILES += $(DISTNAME).tar.bz2 -# Once upon a time, this build also supported the version 2.8.5 for backward -# compatibility. Unfortunately, it was segfaulting. As a workaround, binary -# files copied from the old package have been provided. -MODULATIONS_VERSION = 2.8.10 +VENDOR_URL = http://www.wxwidgets.org/ -MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only -MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only -MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all -MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all +LICENSE = docs/licence.txt SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) @@ -43,142 +34,449 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = wxwindows +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += SUNWxwinc -PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PACKAGES = CSWwxwidgetscommon -PACKAGES += CSWwxwidgetsdevel -PACKAGES += CSWwxwidgetsgtk2 -SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files -SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files -SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support +#PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWglib2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWjpeg -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibatk -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibsm -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpng -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWtiff -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWzlib +#PACKAGES += CSWwxwidgetscommon +CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common_stub +SPKG_DESC_CSWwxwidgetscommon = common +#PACKAGES += CSWwxwidgetsgtk2 +CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2_stub +SPKG_DESC_CSWwxwidgetsgtk2 = gtk2 -# Dependencies between wxwidgets subpackages -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 +#PACKAGES += CSWwxwidgetsdevel +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub +SPKG_DESC_CSWwxwidgetsdevel = devel -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS += CSWlibpthreadstubs -BUILD_DEP_PKGS += CSWxproto -BUILD_DEP_PKGS += CSWkbproto -BUILD_DEP_PKGS += CSWlibxcb -BUILD_DEP_PKGS += CSWlibxcbdevel -BUILD_DEP_PKGS += CSWlibxau -# BUILD_DEP_PKGS += CSWlibxaudevel -BUILD_DEP_PKGS += CSWlibxrenderdevel -# BUILD_DEP_PKGS += CSWrenderproto -BUILD_DEP_PKGS += SUNWxwinc +PACKAGES += CSWlibwx-gtk2u-adv2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-adv2-9-3 += $(DESCRIPTION), libwx_gtk2u_adv-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-adv2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_adv-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgio2-0-0 -PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.* -PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) +PACKAGES += CSWlibwx-gtk2u-aui2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-aui2-9-3 += $(DESCRIPTION), libwx_gtk2u_aui-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-aui2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_aui-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibglib2-0-0 -CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common -CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel -CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 + +PACKAGES += CSWlibwx-gtk2u-core2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-core2-9-3 += $(DESCRIPTION), libwx_gtk2u_core-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-core2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_core-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgio2-0-0 + +PACKAGES += CSWlibwx-gtk2u-gl2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-gl2-9-3 += $(DESCRIPTION), libwx_gtk2u_gl-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-gl2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_gl-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWmesa +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-html2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-html2-9-3 += $(DESCRIPTION), libwx_gtk2u_html-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-html2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_html-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibmspack0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-media2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-media2-9-3 += $(DESCRIPTION), libwx_gtk2u_media-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-media2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_media-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWgstplugins +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWgstreamer +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-propgrid2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-propgrid2-9-3 += $(DESCRIPTION), libwx_gtk2u_propgrid-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-propgrid2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_propgrid-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-qa2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-qa2-9-3 += $(DESCRIPTION), libwx_gtk2u_qa-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-qa2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_qa-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-ribbon2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-ribbon2-9-3 += $(DESCRIPTION), libwx_gtk2u_ribbon-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-ribbon2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_ribbon-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibatk1-0-0 + +PACKAGES += CSWlibwx-gtk2u-richtext2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-richtext2-9-3 += $(DESCRIPTION), libwx_gtk2u_richtext-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-richtext2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_richtext-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-stc2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-stc2-9-3 += $(DESCRIPTION), libwx_gtk2u_stc-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-stc2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_stc-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibatk1-0-0 + +PACKAGES += CSWlibwx-gtk2u-xrc2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-xrc2-9-3 += $(DESCRIPTION), libwx_gtk2u_xrc-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-xrc2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_xrc-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-baseu2-9-3 +SPKG_DESC_CSWlibwx-baseu2-9-3 += $(DESCRIPTION), libwx_baseu-2.9.so.3 +PKGFILES_CSWlibwx-baseu2-9-3 += $(call pkgfiles_lib,libwx_baseu-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu2-9-3 += CSWlibz1 + +PACKAGES += CSWlibwx-baseu-net2-9-3 +SPKG_DESC_CSWlibwx-baseu-net2-9-3 += $(DESCRIPTION), libwx_baseu_net-2.9.so.3 +PKGFILES_CSWlibwx-baseu-net2-9-3 += $(call pkgfiles_lib,libwx_baseu_net-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu-net2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibz1 + +PACKAGES += CSWlibwx-baseu-xml2-9-3 +SPKG_DESC_CSWlibwx-baseu-xml2-9-3 += $(DESCRIPTION), libwx_baseu_xml-2.9.so.3 +PKGFILES_CSWlibwx-baseu-xml2-9-3 += $(call pkgfiles_lib,libwx_baseu_xml-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibz1 + +PACKAGES += CSWwxwidgetsgtk2-dev +SPKG_DESC_CSWwxwidgetsgtk2-dev += $(DESCRIPTION), development files +PKGFILES_CSWwxwidgetsgtk2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWwxwidgetsgtk2-dev += $(bindir)/wxrc.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(libdir)/wx/config/.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(libdir)/wx/include/.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(sharedstatedir)/bakefile/.* +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-gl2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-xrc2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-richtext2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-aui2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-media2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-ribbon2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-stc2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-qa2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu-net2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-propgrid2-9-3 +OBSOLETED_BY_CSWwxwidgetsgtk2-dev += CSWwxwidgetsdevel +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub + +PACKAGES += CSWwxwidgets +SPKG_DESC_CSWwxwidgets = catchall +# PKGFILES is catchall + +# There is no testsuite TEST_SCRIPTS = -# To fix a problem with unresolved symbols -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so # For vsscanf support # EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so -EXTRA_LINKER_FLAGS += -lncursesw +#EXTRA_LINKER_FLAGS += -lncursesw # To fix the __sincos problem on x86 -EXTRA_LINKER_FLAGS += -lsunmath +#EXTRA_LINKER_FLAGS += -lsunmath +# We need 64 bit gstreamer, disable for now +# BUILD64_LIBS_ONLY = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 -CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw +CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl CONFIGURE_ARGS += --enable-unicode -EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +CONFIGURE_ARGS += --with-libmspack -# The 2.8.5 version has been compiled as a monolithic library. Building it the -# same way for backwards compatibility. -CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic -CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION)) +#EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ +#EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -INSTALL_SCRIPTS = wxwidgets +EXTRA_LDFLAGS += -norunpath -LICENSE = docs/licence.txt +#INSTALL_SCRIPTS = wxwidgets include gar/category.mk -install-wxwidgets: - (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - @$(MAKECOOKIE) +#install-wxwidgets: +# (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) +# (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) +# @$(MAKECOOKIE) -post-merge: - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 - @$(MAKECOOKIE) +#post-merge: +# ginstall -m 755 \ +# $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ +# $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 +# ginstall -m 755 \ +# $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ +# $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-05 20:18:33 UTC (rev 21286) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/checksums 2013-06-07 07:56:54 UTC (rev 21294) @@ -1,9 +1 @@ -7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch -225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch -d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 -6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc -9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 -5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc -05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz +6b6003713289ea4d3cd9b49c5db5b721 wxWidgets-2.9.3.tar.bz2 Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-05 20:18:33 UTC (rev 21286) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/Makefile 2013-06-07 07:56:54 UTC (rev 21294) @@ -3,7 +3,7 @@ # $Id$ NAME = wxWidgets -VERSION = 2.8.10 +VERSION = 2.9.3 GARTYPE = v2 define BLURB wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, @@ -13,24 +13,15 @@ the platform's own native controls rather than emulating them. endef -# The unicode version can't be currently built on Solaris 8. Doing separate -# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. -# More details below, look for 'unicode'. -# PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +SF_PROJ = wxwindows +MASTER_SITES += $(SF_MIRRORS) -EXTRA_MODULATORS = VERSION +DESCRIPTION = WX Widgets Cross-Platform GUI Library +DISTFILES += $(DISTNAME).tar.bz2 -# Once upon a time, this build also supported the version 2.8.5 for backward -# compatibility. Unfortunately, it was segfaulting. As a workaround, binary -# files copied from the old package have been provided. -MODULATIONS_VERSION = 2.8.10 +VENDOR_URL = http://www.wxwidgets.org/ -MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only -MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only -MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all -MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all +LICENSE = docs/licence.txt SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) @@ -43,142 +34,449 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = wxwindows +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += SUNWxwinc -PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PACKAGES = CSWwxwidgetscommon -PACKAGES += CSWwxwidgetsdevel -PACKAGES += CSWwxwidgetsgtk2 -SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files -SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files -SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support +#PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +#PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch +#PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWglib2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWjpeg -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibatk -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibsm -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpng -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWtiff -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWzlib +#PACKAGES += CSWwxwidgetscommon +CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common_stub +SPKG_DESC_CSWwxwidgetscommon = common +#PACKAGES += CSWwxwidgetsgtk2 +CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2_stub +SPKG_DESC_CSWwxwidgetsgtk2 = gtk2 -# Dependencies between wxwidgets subpackages -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 +#PACKAGES += CSWwxwidgetsdevel +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub +SPKG_DESC_CSWwxwidgetsdevel = devel -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS += CSWlibpthreadstubs -BUILD_DEP_PKGS += CSWxproto -BUILD_DEP_PKGS += CSWkbproto -BUILD_DEP_PKGS += CSWlibxcb -BUILD_DEP_PKGS += CSWlibxcbdevel -BUILD_DEP_PKGS += CSWlibxau -# BUILD_DEP_PKGS += CSWlibxaudevel -BUILD_DEP_PKGS += CSWlibxrenderdevel -# BUILD_DEP_PKGS += CSWrenderproto -BUILD_DEP_PKGS += SUNWxwinc +PACKAGES += CSWlibwx-gtk2u-adv2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-adv2-9-3 += $(DESCRIPTION), libwx_gtk2u_adv-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-adv2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_adv-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-adv2-9-3 += CSWlibgio2-0-0 -PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.* -PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) +PACKAGES += CSWlibwx-gtk2u-aui2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-aui2-9-3 += $(DESCRIPTION), libwx_gtk2u_aui-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-aui2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_aui-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-aui2-9-3 += CSWlibglib2-0-0 -CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common -CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel -CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 + +PACKAGES += CSWlibwx-gtk2u-core2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-core2-9-3 += $(DESCRIPTION), libwx_gtk2u_core-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-core2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_core-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-core2-9-3 += CSWlibgio2-0-0 + +PACKAGES += CSWlibwx-gtk2u-gl2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-gl2-9-3 += $(DESCRIPTION), libwx_gtk2u_gl-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-gl2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_gl-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWmesa +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-gl2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-html2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-html2-9-3 += $(DESCRIPTION), libwx_gtk2u_html-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-html2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_html-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibmspack0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-html2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-media2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-media2-9-3 += $(DESCRIPTION), libwx_gtk2u_media-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-media2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_media-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWgstplugins +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWgstreamer +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-media2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-propgrid2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-propgrid2-9-3 += $(DESCRIPTION), libwx_gtk2u_propgrid-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-propgrid2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_propgrid-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-propgrid2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-qa2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-qa2-9-3 += $(DESCRIPTION), libwx_gtk2u_qa-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-qa2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_qa-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-qa2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-ribbon2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-ribbon2-9-3 += $(DESCRIPTION), libwx_gtk2u_ribbon-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-ribbon2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_ribbon-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-ribbon2-9-3 += CSWlibatk1-0-0 + +PACKAGES += CSWlibwx-gtk2u-richtext2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-richtext2-9-3 += $(DESCRIPTION), libwx_gtk2u_richtext-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-richtext2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_richtext-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-richtext2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-gtk2u-stc2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-stc2-9-3 += $(DESCRIPTION), libwx_gtk2u_stc-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-stc2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_stc-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-stc2-9-3 += CSWlibatk1-0-0 + +PACKAGES += CSWlibwx-gtk2u-xrc2-9-3 +SPKG_DESC_CSWlibwx-gtk2u-xrc2-9-3 += $(DESCRIPTION), libwx_gtk2u_xrc-2.9.so.3 +PKGFILES_CSWlibwx-gtk2u-xrc2-9-3 += $(call pkgfiles_lib,libwx_gtk2u_xrc-2.9.so.3) +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWpango +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-gtk2u-xrc2-9-3 += CSWlibglib2-0-0 + +PACKAGES += CSWlibwx-baseu2-9-3 +SPKG_DESC_CSWlibwx-baseu2-9-3 += $(DESCRIPTION), libwx_baseu-2.9.so.3 +PKGFILES_CSWlibwx-baseu2-9-3 += $(call pkgfiles_lib,libwx_baseu-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu2-9-3 += CSWlibz1 + +PACKAGES += CSWlibwx-baseu-net2-9-3 +SPKG_DESC_CSWlibwx-baseu-net2-9-3 += $(DESCRIPTION), libwx_baseu_net-2.9.so.3 +PKGFILES_CSWlibwx-baseu-net2-9-3 += $(call pkgfiles_lib,libwx_baseu_net-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu-net2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-net2-9-3 += CSWlibz1 + +PACKAGES += CSWlibwx-baseu-xml2-9-3 +SPKG_DESC_CSWlibwx-baseu-xml2-9-3 += $(DESCRIPTION), libwx_baseu_xml-2.9.so.3 +PKGFILES_CSWlibwx-baseu-xml2-9-3 += $(call pkgfiles_lib,libwx_baseu_xml-2.9.so.3) +RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibwx-baseu-xml2-9-3 += CSWlibz1 + +PACKAGES += CSWwxwidgetsgtk2-dev +SPKG_DESC_CSWwxwidgetsgtk2-dev += $(DESCRIPTION), development files +PKGFILES_CSWwxwidgetsgtk2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWwxwidgetsgtk2-dev += $(bindir)/wxrc.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(libdir)/wx/config/.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(libdir)/wx/include/.* +PKGFILES_CSWwxwidgetsgtk2-dev += $(sharedstatedir)/bakefile/.* +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-gl2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-xrc2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-richtext2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-core2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-aui2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-html2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-media2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-ribbon2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-stc2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-qa2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu-net2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-adv2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-baseu-xml2-9-3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2-dev += CSWlibwx-gtk2u-propgrid2-9-3 +OBSOLETED_BY_CSWwxwidgetsgtk2-dev += CSWwxwidgetsdevel +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub + +PACKAGES += CSWwxwidgets +SPKG_DESC_CSWwxwidgets = catchall +# PKGFILES is catchall + +# There is no testsuite TEST_SCRIPTS = -# To fix a problem with unresolved symbols -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so # For vsscanf support # EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so -EXTRA_LINKER_FLAGS += -lncursesw +#EXTRA_LINKER_FLAGS += -lncursesw # To fix the __sincos problem on x86 -EXTRA_LINKER_FLAGS += -lsunmath +#EXTRA_LINKER_FLAGS += -lsunmath +# We need 64 bit gstreamer, disable for now +# BUILD64_LIBS_ONLY = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 -CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw +CONFIGURE_ARGS += --with-gtk-prefix=$(prefix) CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl CONFIGURE_ARGS += --enable-unicode -EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +CONFIGURE_ARGS += --with-libmspack -# The 2.8.5 version has been compiled as a monolithic library. Building it the -# same way for backwards compatibility. -CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic -CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION)) +#EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ +#EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -INSTALL_SCRIPTS = wxwidgets +EXTRA_LDFLAGS += -norunpath -LICENSE = docs/licence.txt +#INSTALL_SCRIPTS = wxwidgets include gar/category.mk -install-wxwidgets: - (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - @$(MAKECOOKIE) +#install-wxwidgets: +# (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) +# (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) +# @$(MAKECOOKIE) -post-merge: - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 - @$(MAKECOOKIE) +#post-merge: +# ginstall -m 755 \ +# $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ +# $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 +# ginstall -m 755 \ +# $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ +# $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-05 20:18:33 UTC (rev 21286) +++ csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.9.3/trunk/checksums 2013-06-07 07:56:54 UTC (rev 21294) @@ -1,9 +1 @@ -7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch -225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch -d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 -6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc -9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 -5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc -05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz +6b6003713289ea4d3cd9b49c5db5b721 wxWidgets-2.9.3.tar.bz2 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 Jun 7 11:18:34 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 07 Jun 2013 09:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21295] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 21295 http://gar.svn.sourceforge.net/gar/?rev=21295&view=rev Author: lblume Date: 2013-06-07 09:18:31 +0000 (Fri, 07 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.32 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-06-07 07:56:54 UTC (rev 21294) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-06-07 09:18:31 UTC (rev 21295) @@ -10,11 +10,11 @@ # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide -PROJ_NAME = mysql -NAME = $(PROJ_NAME)5 +PROJ_NAME = mysql +NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 31 -ALTS_PRIO = 55 +PATCHLEVEL = 32 +ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) # Useful when making a series of builds on the same day @@ -23,7 +23,8 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -#Use newest Sun Stuido on Solaris10 to solve problems on Solaris10 x86 64bit build: +# Use newest Sun Studio on Solaris10 to solve problems on Solaris10 x86 +# 64bit build: ifneq ($(shell /usr/bin/uname -r),5.9) GARCOMPILER = SOS12U3 endif @@ -229,6 +230,7 @@ # The line below come from the official MySQL build configuration CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" @@ -245,9 +247,6 @@ CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" -ifneq ($(shell /usr/bin/uname -r),5.9) -CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" -endif USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jun 7 11:21:38 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 09:21:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[21296] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 21296 http://gar.svn.sourceforge.net/gar/?rev=21296&view=rev Author: slowfranklin Date: 2013-06-07 09:21:38 +0000 (Fri, 07 Jun 2013) Log Message: ----------- glib2/trunk: Add empty file gschemas.compiled to fix crash in gsettings Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2013-06-07 09:18:31 UTC (rev 21295) +++ csw/mgar/pkg/glib2/trunk/Makefile 2013-06-07 09:21:38 UTC (rev 21296) @@ -16,7 +16,7 @@ define BLURB GLib is a library containing many useful C routines for things such as trees, hashes, and lists. GLib was previously distributed with the GTK toolkit, but - has been split off as of the developers' version 1.1.0. + has been split off as of the developers version 1.1.0. endef MASTER_SITES = $(GNOME_MIRROR) @@ -192,6 +192,7 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) +# FIXME: at least glib-compile-schemas and gsettings should be moved to CSWglib2 PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.* PKGFILES_CSWlibglib2-dev += .*/bash-completion.* @@ -327,6 +328,14 @@ # without putting /opt/csw/bin first in PATH PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) +# fix a gsettings crash in case this file doesn't exist yet +# it is normally created by glib-compile-schemas, packages like Tracker add such xml schema +# files, but as long as no schema file exists, glib-compile-schemas doesn't create the file +post-install-modulated: + @touch $(DESTDIR)/opt/csw/share/glib-2.0/schemas/gschemas.compiled + @chmod 0644 $(DESTDIR)/opt/csw/share/glib-2.0/schemas/gschemas.compiled + @$(MAKECOOKIE) + post-merge: @echo "=== Cleanup stray bash_completion.d ===" if [ -d $(PKGROOT)$(prefix)/bash_completion.d ] ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jun 7 11:34:51 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 09:34:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21297] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21297 http://gar.svn.sourceforge.net/gar/?rev=21297&view=rev Author: slowfranklin Date: 2013-06-07 09:34:50 +0000 (Fri, 07 Jun 2013) Log Message: ----------- tracker/trunk: Add glib-compile-schemas postinstall hook Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 09:21:38 UTC (rev 21296) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 09:34:50 UTC (rev 21297) @@ -19,6 +19,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES += CSWtracker.postinstall GARCOMPILER = GNU BUILD_DEP_PKGS += CSWlibgsf-dev @@ -46,6 +47,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 Added: csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall =================================================================== --- csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall 2013-06-07 09:34:50 UTC (rev 21297) @@ -0,0 +1,3 @@ +#!/bin/sh +ROOT=${PKG_INSTALL_ROOT:-/} +glib-compile-schemas --targetdir=${ROOT}/opt/csw/share/glib-2.0/schemas/ ${ROOT}opt/csw/share/glib-2.0/schemas/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jun 7 11:50:31 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 09:50:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21298] csw/mgar/pkg/tracker/trunk/files/CSWtracker. postinstall Message-ID: Revision: 21298 http://gar.svn.sourceforge.net/gar/?rev=21298&view=rev Author: slowfranklin Date: 2013-06-07 09:50:28 +0000 (Fri, 07 Jun 2013) Log Message: ----------- tracker/trunk: root-relocated glib-compile-schemas and add missing slash Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall Modified: csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall =================================================================== --- csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall 2013-06-07 09:34:50 UTC (rev 21297) +++ csw/mgar/pkg/tracker/trunk/files/CSWtracker.postinstall 2013-06-07 09:50:28 UTC (rev 21298) @@ -1,3 +1,3 @@ #!/bin/sh ROOT=${PKG_INSTALL_ROOT:-/} -glib-compile-schemas --targetdir=${ROOT}/opt/csw/share/glib-2.0/schemas/ ${ROOT}opt/csw/share/glib-2.0/schemas/ +${ROOT}/opt/csw/bin/glib-compile-schemas --targetdir=${ROOT}/opt/csw/share/glib-2.0/schemas/ ${ROOT}/opt/csw/share/glib-2.0/schemas/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jun 7 12:37:08 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 10:37:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21299] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21299 http://gar.svn.sourceforge.net/gar/?rev=21299&view=rev Author: slowfranklin Date: 2013-06-07 10:37:06 +0000 (Fri, 07 Jun 2013) Log Message: ----------- tracker/trunk: CSWlibglib2-dev was already in the list of required packages Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 09:50:28 UTC (rev 21298) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 10:37:06 UTC (rev 21299) @@ -54,8 +54,6 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWtracker += CSWdbus RUNTIME_DEP_PKGS_CSWtracker += CSWdconf -# for gsettings binary -RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1 RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-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 Fri Jun 7 14:46:13 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 12:46:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21300] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21300 http://gar.svn.sourceforge.net/gar/?rev=21300&view=rev Author: slowfranklin Date: 2013-06-07 12:46:10 +0000 (Fri, 07 Jun 2013) Log Message: ----------- tracker/trunk: Move gschema xml files to the main tracker package Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 10:37:06 UTC (rev 21299) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 12:46:10 UTC (rev 21300) @@ -111,6 +111,7 @@ CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev +PKGFILES_CSWtracker += $(datadir)/glib-2\.0/schemas/org\.freedesktop\.Tracker.* PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common @@ -143,7 +144,6 @@ PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so) PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) -PKGFILES_CSWlibtracker0-16-dev += $(datadir)/glib-2\.0/schemas/org\.freedesktop\.Tracker.* PKGFILES_CSWlibtracker0-16-dev += $(datadir)/vala/vapi/tracker-.* # For gettext This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Jun 7 15:23:48 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Jun 2013 13:23:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21301] csw/mgar/pkg/bacula/trunk Message-ID: Revision: 21301 http://gar.svn.sourceforge.net/gar/?rev=21301&view=rev Author: wilbury Date: 2013-06-07 13:23:44 +0000 (Fri, 07 Jun 2013) Log Message: ----------- bacula/trunk: Update to 5.2.6, take 1 Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile csw/mgar/pkg/bacula/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch Removed Paths: ------------- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2013-06-07 12:46:10 UTC (rev 21300) +++ csw/mgar/pkg/bacula/trunk/Makefile 2013-06-07 13:23:44 UTC (rev 21301) @@ -1,6 +1,6 @@ # $Id$ NAME = bacula -VERSION = 5.0.3 +VERSION = 5.2.6 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -22,10 +22,7 @@ DISTFILES += CSWbacula-fd.postinstall DISTFILES += CSWbacula-console.postinstall DISTFILES += postmsg -PATCHFILES += 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch -PATCHFILES += 0002-Clean-up-solaris-install-autostart-targets.patch -PATCHFILES += 0003-Make-the-solaris-init-scripts-user-group-aware.patch -PATCHFILES += 0004-Update-man-page-installation-so-we-don-t-get-gzipped.patch +PATCHFILES += 0001-Do-not-compress-manual-pages.patch BUILD_DEP_PKGS = CSWmysql-dev CSWiconv CSWlibwrap1 CSWlibssl-dev BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev @@ -50,13 +47,8 @@ SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console OBSOLETED_BY_CSWbacula-console = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibhistory6 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibgcc-s1 PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW @@ -80,47 +72,34 @@ SPKG_DESC_CSWbacula-doc = $(DESCRIPTION) - Documentation PKGFILES_CSWbacula-doc += .*doc/$(NAME)/.* ARCHALL_CSWbacula-doc = 1 -CHECKPKG_OVERRIDES_CSWbacula-doc += file-with-bad-content -CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWbacula-doc += missing-dependency|CSWperl +RUNTIME_DEP_PKGS_CSWbacula-doc += CSWpython +RUNTIME_DEP_PKGS_CSWbacula-doc += CSWperl CATALOGNAME_CSWbacula-tray-monitor = bacula_tray_monitor SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor OBSOLETED_BY_CSWbacula-tray-monitor = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibz1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgtk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgio2-0-0 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* CATALOGNAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so -PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so +PKGFILES_CSWbacula-common += .*libbaccats-$(VERSION).so .*libbaccats.so +PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so PKGFILES_CSWbacula-common += .*libbacfind-$(VERSION).so .*libbacfind.so PKGFILES_CSWbacula-common += .*libbacpy-$(VERSION).so .*libbacpy.so PKGFILES_CSWbacula-common += .*libbacsql-$(VERSION).so .*libbacsql.so @@ -128,18 +107,16 @@ PKGFILES_CSWbacula-common += .*man1/bsmtp.1 .*man1/btraceback.1 PKGFILES_CSWbacula-common += .*man8/bacula.8 PKGFILES_CSWbacula-common += /etc/opt/csw//bacula/scripts/btraceback.* -CHECKPKG_OVERRIDES_CSWbacula-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/bacula.8 CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWliblzo2-2 PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8 .*bacula/bacula-fd.conf.CSW @@ -153,12 +130,9 @@ RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibz1 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWliblzo2-2 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer.CSW @@ -183,12 +157,8 @@ RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl PKGFILES_CSWbacula-director += .*init.d/cswbacula-dir PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir Modified: csw/mgar/pkg/bacula/trunk/checksums =================================================================== --- csw/mgar/pkg/bacula/trunk/checksums 2013-06-07 12:46:10 UTC (rev 21300) +++ csw/mgar/pkg/bacula/trunk/checksums 2013-06-07 13:23:44 UTC (rev 21301) @@ -1 +1 @@ -9de254ae39cab0587fdb2f5d8d90b03b bacula-5.0.3.tar.gz +914483b92539598678542bd2ddb28043 bacula-5.2.6.tar.gz Added: csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0001-Do-not-compress-manual-pages.patch 2013-06-07 13:23:44 UTC (rev 21301) @@ -0,0 +1,44 @@ +From 591de1c22236564111941b5244d109ca0f6bc860 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Fri, 7 Jun 2013 14:44:24 +0200 +Subject: [PATCH] Do not compress manual pages. + +--- + manpages/Makefile.in | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/manpages/Makefile.in b/manpages/Makefile.in +index bbbc6ae..5b1beda 100644 +--- a/manpages/Makefile.in ++++ b/manpages/Makefile.in +@@ -21,23 +21,19 @@ depend: + install: + $(MKDIR) $(DESTDIR)/$(mandir)/man8 + for I in ${MAN8}; \ +- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ +- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ +- rm -f $$I.gz); \ ++ do ($(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I;); \ + done + $(MKDIR) $(DESTDIR)/$(mandir)/man1 + for I in ${MAN1}; \ +- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ +- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \ +- rm -f $$I.gz); \ ++ do ($(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I;); \ + done + + uninstall: + for I in ${MAN8}; \ +- do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \ ++ do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \ + done + for I in ${MAN1}; \ +- do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ ++ do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ + done + + clean: +-- +1.8.1.4 + Deleted: csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2013-06-07 12:46:10 UTC (rev 21300) +++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2013-06-07 13:23:44 UTC (rev 21301) @@ -1,38 +0,0 @@ -From b7109446f989d6b9bb449dca6cde6bc9dfddb1fe Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Wed, 13 Apr 2011 22:08:21 +0200 -Subject: [PATCH] Update AC_INIT use to make configure handle docdir - -This patch allows AC_INIT to properly set the PACKAGE variables in the -Makefiles. In turn, this allows docdir use to work correctly. With -the new behaviour, things placed in docdir go to share/doc/bacula. -Previously the would end up in share/doc. - -We move the detection of the source directory to a separate -AC_CONFIG_SRCDIR macro call. - -Signed-off-by: Ben Walton ---- - autoconf/configure.in | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/autoconf/configure.in b/autoconf/configure.in -index 0ce9d94..1115e7a 100644 ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -3,8 +3,10 @@ dnl - dnl Process this file with autoconf to produce a configure script. - dnl - dnl require a recent autoconf --AC_PREREQ(2.61) --AC_INIT(src/version.h) -+AC_PREREQ(2.62) -+ -+AC_INIT([bacula], m4_esyscmd([sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' `pwd`/src/version.h | tr -d '\n'])) -+AC_CONFIG_SRCDIR(src/version.h) - BUILD_DIR=`pwd` - cd .. - TOP_DIR=`pwd` --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Fri Jun 7 16:11:43 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Fri, 07 Jun 2013 14:11:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21302] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21302 http://gar.svn.sourceforge.net/gar/?rev=21302&view=rev Author: slowfranklin Date: 2013-06-07 14:11:42 +0000 (Fri, 07 Jun 2013) Log Message: ----------- tracker/trunk: Remove PKGFILES, it's added by catchall anyway Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 13:23:44 UTC (rev 21301) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-07 14:11:42 UTC (rev 21302) @@ -111,7 +111,6 @@ CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev -PKGFILES_CSWtracker += $(datadir)/glib-2\.0/schemas/org\.freedesktop\.Tracker.* PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Fri Jun 7 17:38:54 2013 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Fri, 07 Jun 2013 15:38:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21303] csw/mgar/pkg/bacula/trunk/files/ 0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Message-ID: Revision: 21303 http://gar.svn.sourceforge.net/gar/?rev=21303&view=rev Author: wilbury Date: 2013-06-07 15:38:54 +0000 (Fri, 07 Jun 2013) Log Message: ----------- bacula/trunk: Revert a patch file. Added Paths: ----------- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch Added: csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch =================================================================== --- csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch (rev 0) +++ csw/mgar/pkg/bacula/trunk/files/0001-Update-AC_INIT-use-to-make-configure-handle-docdir.patch 2013-06-07 15:38:54 UTC (rev 21303) @@ -0,0 +1,28 @@ +From 7abbac2b02f54436652774ec86107105ef220db8 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 13 Apr 2011 15:48:18 +0200 +Subject: [PATCH] correct the autoconf initializations + +Signed-off-by: Ben Walton +--- + autoconf/configure.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/autoconf/configure.in b/autoconf/configure.in +index 0ce9d94..45c623a 100644 +--- a/autoconf/configure.in ++++ b/autoconf/configure.in +@@ -4,7 +4,8 @@ dnl Process this file with autoconf to produce a configure script. + dnl + dnl require a recent autoconf + AC_PREREQ(2.61) +-AC_INIT(src/version.h) ++AC_INIT([bacula], [5.0.3]) ++AC_CONFIG_SRCDIR(src/version.h) + BUILD_DIR=`pwd` + cd .. + TOP_DIR=`pwd` +-- +1.7.3.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 Fri Jun 7 18:09:49 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 07 Jun 2013 16:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21304] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 21304 http://gar.svn.sourceforge.net/gar/?rev=21304&view=rev Author: lblume Date: 2013-06-07 16:09:49 +0000 (Fri, 07 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Minor build parameter modification Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-06-07 15:38:54 UTC (rev 21303) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-06-07 16:09:49 UTC (rev 21304) @@ -216,7 +216,7 @@ CMAKE_ARGS += -DWITH_ZLIB=system CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci -CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' +CMAKE_ARGS += -DCOMPILATION_COMMENT='OpenCSW' CMAKE_ARGS += -DBUILD_CONFIG=mysql_release CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" @@ -240,7 +240,6 @@ CMAKE_ARGS += "-DWITH_EXTRA_CHARSETS:STRING=all" CMAKE_ARGS += "-DWITH_FEDERATED_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON" -CMAKE_ARGS += "-DWITH_LIBEDIT:BOOL=OFF" CMAKE_ARGS += "-DWITH_PARTITION_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_PIC:BOOL=ON" Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-06-07 15:38:54 UTC (rev 21303) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2013-06-07 16:09:49 UTC (rev 21304) @@ -1 +1 @@ -bf402cbd52a9af33e5c25b2a4bbc56db mysql-5.5.31.tar.gz +dfb817568fde9f9b7400a87eb46022a1 mysql-5.5.32.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 Fri Jun 7 21:18:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 07 Jun 2013 19:18:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21305] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 21305 http://gar.svn.sourceforge.net/gar/?rev=21305&view=rev Author: lblume Date: 2013-06-07 19:18:22 +0000 (Fri, 07 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.5.x: Reinstate lines inadvertently removed; some bonus cleanup of old lines 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-06-07 16:09:49 UTC (rev 21304) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2013-06-07 19:18:22 UTC (rev 21305) @@ -33,7 +33,8 @@ # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus -# Solaris 10 needs a special map file since we need libnsl Version 1.9.1 and libc 1.22.5 +# Solaris 10 needs a special map file since we need libnsl Version 1.9.1 +# and libc 1.22.5 ifneq ($(shell /usr/bin/uname -r),5.9) LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" @@ -230,7 +231,6 @@ # The line below come from the official MySQL build configuration CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" -CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" @@ -246,6 +246,9 @@ CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" +ifneq ($(shell /usr/bin/uname -r),5.9) +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" +endif USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup @@ -320,8 +323,6 @@ --skip-test=archive-big --skip-test=/gis/ configure-custom: - # --debug-output \ - # --debug-trycompile \ (cd $(WORKSRC) && \ /usr/bin/env -i \ $(CONFIGURE_ENV) \ @@ -344,16 +345,10 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d - # # Add versions to binary names - # for f in $(EXECUTABLES); do \ - # gmv -v "$(DESTDIR)$(bindir)/$${f}" \ - # "$(DESTDIR)$(bindir)/$${f}"; \ - # done (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) - # gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1 @$(MAKECOOKIE) post-merge: @@ -366,7 +361,6 @@ $(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 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(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 Fri Jun 7 22:26:33 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 07 Jun 2013 20:26:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21306] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21306 http://gar.svn.sourceforge.net/gar/?rev=21306&view=rev Author: chninkel Date: 2013-06-07 20:26:29 +0000 (Fri, 07 Jun 2013) Log Message: ----------- gnutls3/trunk: configure unbound root key path Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-07 19:18:22 UTC (rev 21305) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-07 20:26:29 UTC (rev 21306) @@ -74,7 +74,8 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-lzo CONFIGURE_ARGS += --disable-guile -CONFIGURE_ARGS += --with-default-trust-store-file=$(sysconfdir)/ssl/certs/ca-certificates.crt +CONFIGURE_ARGS += --with-default-trust-store-file=$(sysconfdir)/ssl/certs/ca-certificates.crt +CONFIGURE_ARGS += --with-unbound-root-key-file=$(sysconfdir)/unbound/root.key # Workaround a host detection bug in configure for amd64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e '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 Fri Jun 7 22:27:17 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 07 Jun 2013 20:27:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21307] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21307 http://gar.svn.sourceforge.net/gar/?rev=21307&view=rev Author: chninkel Date: 2013-06-07 20:27:17 +0000 (Fri, 07 Jun 2013) Log Message: ----------- gnutls3/trunk: remove erroneous libgnutls26 dependency Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-07 20:26:29 UTC (rev 21306) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-07 20:27:17 UTC (rev 21307) @@ -43,7 +43,6 @@ PKGFILES_CSWlibgnutls28 = $(PKGFILES_RT) PKGFILES_CSWlibgnutls28 += $(docdir)/libgnutls28/.* RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibhogweed2 RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgnutls28 += CSWlibp11kit0 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 Jun 8 19:20:51 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 08 Jun 2013 17:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21308] csw/mgar/pkg/gnutls3/trunk/Makefile Message-ID: Revision: 21308 http://gar.svn.sourceforge.net/gar/?rev=21308&view=rev Author: chninkel Date: 2013-06-08 17:20:48 +0000 (Sat, 08 Jun 2013) Log Message: ----------- gnutls3/trunk: disable libdane support and remove LD_OPTIONS that break tests Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-07 20:27:17 UTC (rev 21307) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-08 17:20:48 UTC (rev 21308) @@ -63,9 +63,6 @@ PATCHFILES += 0001-no-gets-warning.patch -# We don't need it and if defined the test breaks -#LD_OPTIONS = - # EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 BUILD64 = 1 @@ -73,12 +70,16 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-lzo CONFIGURE_ARGS += --disable-guile +CONFIGURE_ARGS += --disable-libdane CONFIGURE_ARGS += --with-default-trust-store-file=$(sysconfdir)/ssl/certs/ca-certificates.crt CONFIGURE_ARGS += --with-unbound-root-key-file=$(sysconfdir)/unbound/root.key # Workaround a host detection bug in configure for amd64 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) CONFIGURE_ARGS_amd64 += --build=x86_64-pc-solaris2$(shell uname -r |sed -e 's/[^.]*//') +# If defined with the default value, the test breaks +# # so we only keep the required items +LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE) 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 Sat Jun 8 22:02:03 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 08 Jun 2013 20:02:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21309] csw/mgar/pkg Message-ID: Revision: 21309 http://gar.svn.sourceforge.net/gar/?rev=21309&view=rev Author: lblume Date: 2013-06-08 20:01:58 +0000 (Sat, 08 Jun 2013) Log Message: ----------- pidgin-sipe/trunk: Add pidgin-sipe Added Paths: ----------- csw/mgar/pkg/pidgin-sipe/ csw/mgar/pkg/pidgin-sipe/Makefile csw/mgar/pkg/pidgin-sipe/branches/ csw/mgar/pkg/pidgin-sipe/tags/ csw/mgar/pkg/pidgin-sipe/trunk/ csw/mgar/pkg/pidgin-sipe/trunk/Makefile csw/mgar/pkg/pidgin-sipe/trunk/checksums csw/mgar/pkg/pidgin-sipe/trunk/files/ Added: csw/mgar/pkg/pidgin-sipe/Makefile =================================================================== --- csw/mgar/pkg/pidgin-sipe/Makefile (rev 0) +++ csw/mgar/pkg/pidgin-sipe/Makefile 2013-06-08 20:01:58 UTC (rev 21309) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pidgin-sipe/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pidgin-sipe/trunk/Makefile =================================================================== --- csw/mgar/pkg/pidgin-sipe/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pidgin-sipe/trunk/Makefile 2013-06-08 20:01:58 UTC (rev 21309) @@ -0,0 +1,51 @@ +NAME = pidgin-sipe +VERSION = 1.15.1 +GARTYPE = v2 + +DESCRIPTION = The SIPE Project - A third-party Pidgin plugin for Microsoft LCS/OCS +define BLURB + The SIPE Project - A third-party Pidgin plugin for Microsoft LCS/OCS +endef + +GARCOMPILER = GNU + +SF_PROJECT = sipe +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.bz2 + +PACKAGES = CSWpidgin-sipe +CATALOGNAME_CSWpidgin-sipe = pidgin_sipe +SPKG_DESC_CSWpidgin-sipe = A third-party Pidgin plugin for Microsoft LCS/OCS + +# For msgfmt, msgmerge, xgettext and gettext to be used from GNU +CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH) + +CONFIGURE_ARGS = $(DIRPATHS) + +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWpidgin +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibsmime3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWpidgin-sipe += CSWlibnspr4 + +CHECKPKG_OVERRIDES_CSWpidgin-sipe += surplus-dependency|CSWpidgin + +BUILD_DEP_PKGS += CSWintltool +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWfontconfig-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWsunx11devel +BUILD_DEP_PKGS += CSWlibid3-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWpidgin + +include gar/category.mk Property changes on: csw/mgar/pkg/pidgin-sipe/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pidgin-sipe/trunk/checksums =================================================================== --- csw/mgar/pkg/pidgin-sipe/trunk/checksums (rev 0) +++ csw/mgar/pkg/pidgin-sipe/trunk/checksums 2013-06-08 20:01:58 UTC (rev 21309) @@ -0,0 +1 @@ +a08af4ad94a8df901ad01dc05792bec0 pidgin-sipe-1.15.1.tar.bz2 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 Jun 9 22:04:46 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 09 Jun 2013 20:04:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[21310] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 21310 http://gar.svn.sourceforge.net/gar/?rev=21310&view=rev Author: lblume Date: 2013-06-09 20:04:40 +0000 (Sun, 09 Jun 2013) Log Message: ----------- wxwidgets/trunk: Bump version to 2.8.12; clean up recipe and rename packages; remove older bits; add 64 bit version Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile csw/mgar/pkg/wxwidgets/trunk/checksums Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-08 20:01:58 UTC (rev 21309) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-09 20:04:40 UTC (rev 21310) @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = wxWidgets -VERSION = 2.8.10 +NAME = wxWidgets +VERSION = 2.8.12 GARTYPE = v2 define BLURB wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11, @@ -13,138 +13,85 @@ the platform's own native controls rather than emulating them. endef -# The unicode version can't be currently built on Solaris 8. Doing separate -# builds on Solaris 8 and Solaris 9. Unicode support will start in Solaris 9. -# More details below, look for 'unicode'. -# PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 +DISTFILES = $(NAME)-$(VERSION).tar.bz2 -EXTRA_MODULATORS = VERSION - -# Once upon a time, this build also supported the version 2.8.5 for backward -# compatibility. Unfortunately, it was segfaulting. As a workaround, binary -# files copied from the old package have been provided. -MODULATIONS_VERSION = 2.8.10 - -MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only -MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only -MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir) -MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all -MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all - -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz) -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES)) -DISTFILES = $(SOURCEFILES) -DISTFILES += libwx_gtk2u-2.8.so.0.2.0-i386 -DISTFILES += libwx_gtk2u-2.8.so.0.2.0-sparc -DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-i386 -DISTFILES += libwx_gtk2u_gl-2.8.so.0.2.0-sparc SPKG_SOURCEURL = http://www.wxwidgets.org/ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = wxwindows +#PATCHFILES_isa-i386-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-i386-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-i386-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-i386-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch +#PATCHFILES_isa-sparcv8-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch +#PATCHFILES_isa-sparcv8-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch +#PATCHFILES_isa-sparcv8-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch +#PATCHFILES_isa-sparcv8-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-i386-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.5 = 0500-wxT-macro-first-iteration.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch -PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-i386-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PATCHFILES_isa-sparcv8-version-2.8.10 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch -PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch -PACKAGES = CSWwxwidgetscommon -PACKAGES += CSWwxwidgetsdevel +PACKAGES = CSWwxwidgets +PACKAGES += CSWwxwidgets-dev PACKAGES += CSWwxwidgetsgtk2 -SPKG_DESC_CSWwxwidgetscommon = A cross-platform toolkit, common files -SPKG_DESC_CSWwxwidgetsdevel = A cross-platform toolkit, header files -SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetscommon += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWlibxext -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWzlib -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWftype2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWggettextrt -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWglib2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWjpeg -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibatk -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibsm -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibxext +SPKG_DESC_CSWwxwidgets = A cross-platform toolkit +SPKG_DESC_CSWwxwidgets-dev = A cross-platform toolkit, header files +SPKG_DESC_CSWwxwidgetsgtk2 = A cross-platform toolkit, gtk2 support + +RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibz1 + +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWexpat +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWiconv +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWncurses +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWzlib + +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibmspack0 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWncurses RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpng -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWsunmath -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWtiff -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWzlib - # Dependencies between wxwidgets subpackages -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWwxwidgetsdevel += CSWwxwidgetscommon CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets CSWwxwidgetsgtk2 + BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS += CSWgtk2devel -BUILD_DEP_PKGS += CSWlibpthreadstubs -BUILD_DEP_PKGS += CSWxproto -BUILD_DEP_PKGS += CSWkbproto -BUILD_DEP_PKGS += CSWlibxcb -BUILD_DEP_PKGS += CSWlibxcbdevel -BUILD_DEP_PKGS += CSWlibxau -# BUILD_DEP_PKGS += CSWlibxaudevel -BUILD_DEP_PKGS += CSWlibxrenderdevel -# BUILD_DEP_PKGS += CSWrenderproto -BUILD_DEP_PKGS += SUNWxwinc +BUILD_DEP_PKGS += CSWintltool +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWfontconfig-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWsunx11devel +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibexpat-dev -PKGFILES_CSWwxwidgetsdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/bakefile/presets.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/share/aclocal.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wx-config -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc=wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/bin/wxrc-2.8 -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/config.* -PKGFILES_CSWwxwidgetsdevel += /opt/csw/lib/wx/include.* -PKGFILES_CSWwxwidgetsgtk2 = /opt/csw/lib/wx/(include|config)/gtk2-.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/lib/libwx_gtk2.* -PKGFILES_CSWwxwidgetsgtk2 += /opt/csw/bin/wx(-config|rc(|-2.8)) +PKGFILES_CSWwxwidgets = $(libdir).*libwx_base.*\.so\..* +PKGFILES_CSWwxwidgets += $(sharedir)/locale.* -CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common -CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel -CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgets_gtk2 +PKGFILES_CSWwxwidgetsgtk2 = $(libdir).*libwx_gtk2.*\.so\..* + +PKGFILES_CSWwxwidgets-dev = $(PKGFILES_DEVEL) + +CATALOGNAME_CSWwxwidgets = wxwidgets +CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev +CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2 + +OBSOLETED_BY_CSWwxwidgets = CSWwxwidgetscommon +OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel + TEST_SCRIPTS = -# To fix a problem with unresolved symbols -EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so -# For vsscanf support -# EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so -EXTRA_LINKER_FLAGS += -lncursesw -# To fix the __sincos problem on x86 -EXTRA_LINKER_FLAGS += -lsunmath +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gtk=2 @@ -152,33 +99,63 @@ CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl CONFIGURE_ARGS += --enable-unicode -EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__ -EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include -EXTRA_LIB = /opt/csw/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +CONFIGURE_ARGS += --enable-printarch=no +CONFIGURE_ARGS += --with-gnomeprint=no -# The 2.8.5 version has been compiled as a monolithic library. Building it the -# same way for backwards compatibility. -CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic -CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION)) +# -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no +# problem with it being a C++compiler parameter +EXTRA_CFLAGS += -xnorunpath +EXTRA_CXXFLAGS += -norunpath +EXTRA_LDFLAGS += -norunpath +EXTRA_LD_OPTIONS += -z nolazyload -B direct -INSTALL_SCRIPTS = wxwidgets +# wxWidget contains a bunch of .so, let's keep them together as one big +# happy family +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 + +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 + +CHECKPKG_OVERRIDES_CSWwxwidgets += $(CHECKPKG_OVERRIDES_CSWwxwidgets_$(GARCH)) +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += $(CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_$(GARCH)) + +# Only samples inside code comments, can be safely ignored at this point +CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h +CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h +CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/generic/helpext.h + LICENSE = docs/licence.txt include gar/category.mk -install-wxwidgets: - (cd $(WORKSRC); $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - (cd $(WORKSRC)/contrib; $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) - @$(MAKECOOKIE) - -post-merge: - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u-2.8.so.0.2.0 - ginstall -m 755 \ - $(FILEDIR)/libwx_gtk2u_gl-2.8.so.0.2.0-$(GARCH) \ - $(PKGROOT)$(libdir)/libwx_gtk2u_gl-2.8.so.0.2.0 - @$(MAKECOOKIE) Modified: csw/mgar/pkg/wxwidgets/trunk/checksums =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-08 20:01:58 UTC (rev 21309) +++ csw/mgar/pkg/wxwidgets/trunk/checksums 2013-06-09 20:04:40 UTC (rev 21310) @@ -1,9 +1 @@ -7830ab8006ade9b14567341b5481eadd 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -45df2933ed2fa53f229feda01467db81 0002-Fixing-retarded-checks-for-libGL.patch -225f6163a1c31d1f96a3b0548b338105 0003-vsscanf-support-via-ncursesw.patch -969c363847e675dc4d3ad6b8871b96db 0005-stupid-vwscanf-workaround.patch -d4a33d7a1a30965edf15b54bfb011174 libwx_gtk2u-2.8.so.0.2.0-i386 -6a5857bca9695738ba5e185aac4d26e7 libwx_gtk2u-2.8.so.0.2.0-sparc -9f2495b8a4b9b91998a74164efc9ca3a libwx_gtk2u_gl-2.8.so.0.2.0-i386 -5870955c6c23ec655c17b4da92548207 libwx_gtk2u_gl-2.8.so.0.2.0-sparc -05b32ca051651f4b1885a90f62969faf wxWidgets-2.8.10.tar.gz +4103e37e277abeb8aee607b990c215c4 wxWidgets-2.8.12.tar.bz2 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 Jun 10 11:43:14 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 10 Jun 2013 09:43:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21311] csw/mgar/pkg/netatalk/trunk/Makefile Message-ID: Revision: 21311 http://gar.svn.sourceforge.net/gar/?rev=21311&view=rev Author: slowfranklin Date: 2013-06-10 09:43:13 +0000 (Mon, 10 Jun 2013) Log Message: ----------- netatalk/trunk: Fix reinplacement file path Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2013-06-09 20:04:40 UTC (rev 21310) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2013-06-10 09:43:13 UTC (rev 21311) @@ -48,12 +48,12 @@ REINPLACEMENTS += manifest1 REINPLACE_MATCH_manifest1 = network/netatalk REINPLACE_WITH_manifest1 = network/cswnetatalk -REINPLACE_FILES_manifest1 += netatalk.xml.in +REINPLACE_FILES_manifest1 += distrib/initscripts/netatalk.xml.tmpl REINPLACEMENTS += manifest2 REINPLACE_MATCH_manifest2 = name="netatalk" REINPLACE_WITH_manifest2 = name="cswnetatalk" -REINPLACE_FILES_manifest2 += netatalk.xml.in +REINPLACE_FILES_manifest2 += distrib/initscripts/netatalk.xml.tmpl PRESERVECONF += $(sysconfdir)/afp.conf PRESERVECONF += $(sysconfdir)/extmap.conf 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 Jun 10 12:15:09 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 10 Jun 2013 10:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21312] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21312 http://gar.svn.sourceforge.net/gar/?rev=21312&view=rev Author: slowfranklin Date: 2013-06-10 10:15:07 +0000 (Mon, 10 Jun 2013) Log Message: ----------- tracker/trunk: Add required packages for extracting media formats Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-10 09:43:13 UTC (rev 21311) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-10 10:15:07 UTC (rev 21312) @@ -38,6 +38,13 @@ BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibuuid-dev +BUILD_DEP_PKGS += CSWlibiptcdata +BUILD_DEP_PKGS += CSWpoppler-dev +BUILD_DEP_PKGS += CSWexempidevel +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWlibflac-dev +BUILD_DEP_PKGS += CSWgstreamer +BUILD_DEP_PKGS += CSWlibexif-dev RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0 @@ -74,6 +81,12 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWpoppler +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWexempi +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibflac +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWgstreamer RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-common @@ -152,6 +165,7 @@ CONFIGURE_ARGS += --enable-tracker-fts CONFIGURE_ARGS += --disable-unit-tests CONFIGURE_ARGS += --disable-hal +# FIXME: re-enable introspection? afair requires vala CONFIGURE_ARGS += --disable-introspection CONFIGURE_ARGS += --disable-playlist CONFIGURE_ARGS += --disable-nautilus-extension 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 Jun 10 14:34:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 10 Jun 2013 12:34:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21313] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21313 http://gar.svn.sourceforge.net/gar/?rev=21313&view=rev Author: lblume Date: 2013-06-10 12:34:57 +0000 (Mon, 10 Jun 2013) Log Message: ----------- wxwidgets/trunk: Make overrides muuuuch simpler Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 10:15:07 UTC (rev 21312) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 12:34:57 UTC (rev 21313) @@ -82,9 +82,10 @@ PKGFILES_CSWwxwidgets-dev = $(PKGFILES_DEVEL) -CATALOGNAME_CSWwxwidgets = wxwidgets -CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev -CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2 +CATALOGNAME_CSWwxwidgets = wxwidgets +CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev +CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2 +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub OBSOLETED_BY_CSWwxwidgets = CSWwxwidgetscommon OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel @@ -111,45 +112,9 @@ # wxWidget contains a bunch of .so, let's keep them together as one big # happy family -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 +CHECKPKG_OVERRIDES_CSWwxwidgets = shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 = shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 - -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_aui-2.8.so.0|soname=libwx_gtk2u_aui-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-aui2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_richtext-2.8.so.0|soname=libwx_gtk2u_richtext-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-richtext2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_adv-2.8.so.0|soname=libwx_gtk2u_adv-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-adv2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_core-2.8.so.0|soname=libwx_gtk2u_core-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-core2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_gl-2.8.so.0|soname=libwx_gtk2u_gl-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-gl2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_html-2.8.so.0|soname=libwx_gtk2u_html-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-html2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_qa-2.8.so.0|soname=libwx_gtk2u_qa-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-qa2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_gtk2u_xrc-2.8.so.0|soname=libwx_gtk2u_xrc-2.8.so.0|pkgname=CSWwxwidgetsgtk2|expected=CSWlibwx-gtk2u-xrc2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu-2.8.so.0|soname=libwx_baseu-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_net-2.8.so.0|soname=libwx_baseu_net-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-net2-8-0 -CHECKPKG_OVERRIDES_CSWwxwidgets_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libwx_baseu_xml-2.8.so.0|soname=libwx_baseu_xml-2.8.so.0|pkgname=CSWwxwidgets|expected=CSWlibwx-baseu-xml2-8-0 - -CHECKPKG_OVERRIDES_CSWwxwidgets += $(CHECKPKG_OVERRIDES_CSWwxwidgets_$(GARCH)) -CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += $(CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2_$(GARCH)) - # Only samples inside code comments, can be safely ignored at this point CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h @@ -158,4 +123,3 @@ LICENSE = docs/licence.txt 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 Mon Jun 10 18:09:47 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 10 Jun 2013 16:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21314] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21314 http://gar.svn.sourceforge.net/gar/?rev=21314&view=rev Author: lblume Date: 2013-06-10 16:09:44 +0000 (Mon, 10 Jun 2013) Log Message: ----------- wxwidgets/trunk: Slight depedencies rework Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 12:34:57 UTC (rev 21313) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 16:09:44 UTC (rev 21314) @@ -15,19 +15,10 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_SOURCEURL = http://www.wxwidgets.org/ -MASTER_SITES = $(SF_MIRRORS) -SF_PROJECT = wxwindows +SPKG_VENDOR_URL = http://www.wxwidgets.org/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = wxwindows -#PATCHFILES_isa-i386-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -#PATCHFILES_isa-i386-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch -#PATCHFILES_isa-i386-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch -#PATCHFILES_isa-i386-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch -#PATCHFILES_isa-sparcv8-version-2.8.12 = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch -#PATCHFILES_isa-sparcv8-version-2.8.12 += 0002-Fixing-retarded-checks-for-libGL.patch -#PATCHFILES_isa-sparcv8-version-2.8.12 += 0003-vsscanf-support-via-ncursesw.patch -#PATCHFILES_isa-sparcv8-version-2.8.12 += 0005-stupid-vwscanf-workaround.patch - PACKAGES = CSWwxwidgets PACKAGES += CSWwxwidgets-dev PACKAGES += CSWwxwidgetsgtk2 @@ -40,11 +31,7 @@ RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWwxwidgets += CSWlibz1 -RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWexpat -RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWiconv -RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWncurses -RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWzlib - +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibpng15-15 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgdk-pixbuf2-0-0 @@ -57,11 +44,20 @@ RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango -# Dependencies between wxwidgets subpackages -RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWintltool +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWpkgconfig +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibgtk2-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibpcre-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWfontconfig-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibfreetype-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibpng-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWsunx11devel +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibiconv-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWggettext-dev +RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWlibexpat-dev -RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets CSWwxwidgetsgtk2 - BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) BUILD_DEP_PKGS += CSWintltool BUILD_DEP_PKGS += CSWpkgconfig @@ -75,6 +71,7 @@ BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibexpat-dev +# Easier than defining each individual .so.xxx PKGFILES_CSWwxwidgets = $(libdir).*libwx_base.*\.so\..* PKGFILES_CSWwxwidgets += $(sharedir)/locale.* @@ -82,10 +79,11 @@ PKGFILES_CSWwxwidgets-dev = $(PKGFILES_DEVEL) -CATALOGNAME_CSWwxwidgets = wxwidgets -CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev -CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2 -CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub +CATALOGNAME_CSWwxwidgets = wxwidgets +CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev +CATALOGNAME_CSWwxwidgetsgtk2 = wxwidgetsgtk2 +CATALOGNAME_CSWwxwidgetsdevel = wxwidgets_devel_stub +CATALOGNAME_CSWwxwidgetscommon = wxwidgets_common_stub OBSOLETED_BY_CSWwxwidgets = CSWwxwidgetscommon OBSOLETED_BY_CSWwxwidgets-dev = CSWwxwidgetsdevel 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 Jun 10 21:30:14 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 10 Jun 2013 19:30:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[21315] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21315 http://gar.svn.sourceforge.net/gar/?rev=21315&view=rev Author: lblume Date: 2013-06-10 19:30:06 +0000 (Mon, 10 Jun 2013) Log Message: ----------- wxwidgets/trunk: Fix wrong tag Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 16:09:44 UTC (rev 21314) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-10 19:30:06 UTC (rev 21315) @@ -15,9 +15,9 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_VENDOR_URL = http://www.wxwidgets.org/ -MASTER_SITES = $(SF_MIRRORS) -SF_PROJECT = wxwindows +VENDOR_URL = http://www.wxwidgets.org/ +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = wxwindows PACKAGES = CSWwxwidgets PACKAGES += CSWwxwidgets-dev 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 Jun 11 09:55:57 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 11 Jun 2013 07:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21316] csw/mgar/pkg/libicu51/trunk/Makefile Message-ID: Revision: 21316 http://gar.svn.sourceforge.net/gar/?rev=21316&view=rev Author: lblume Date: 2013-06-11 07:55:56 +0000 (Tue, 11 Jun 2013) Log Message: ----------- libicu51/trunk: Remove compiler-specific options from icu-config Modified Paths: -------------- csw/mgar/pkg/libicu51/trunk/Makefile Modified: csw/mgar/pkg/libicu51/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu51/trunk/Makefile 2013-06-10 19:30:06 UTC (rev 21315) +++ csw/mgar/pkg/libicu51/trunk/Makefile 2013-06-11 07:55:56 UTC (rev 21316) @@ -93,3 +93,15 @@ NOISALIST = 1 include gar/category.mk + +# Remove Studio-specific arch references +post-install-modulated: + gsed -i \ + -e '/^[^#]/s/-xO3[^ ]* //' \ + -e '/^[^#]/s/-xarch=[^ ]* //' \ + -e '/^[^#]/s/-xchip=[^ ]* //' \ + -e '/^[^#]/s/-norunpath[^ ]* //' \ + -e '/^[^#]/s/-lCrun[^ ]* //' \ + -e '/^[^#]/s/-lCstd[^ ]* //' \ + $(DESTDIR)$(bindir)/icu-config + 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 Jun 11 10:38:13 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 11 Jun 2013 08:38:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21317] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21317 http://gar.svn.sourceforge.net/gar/?rev=21317&view=rev Author: lblume Date: 2013-06-11 08:38:12 +0000 (Tue, 11 Jun 2013) Log Message: ----------- wxwidgets/trunk: -dev should be catchall to not miss anything Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 07:55:56 UTC (rev 21316) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 08:38:12 UTC (rev 21317) @@ -77,7 +77,8 @@ PKGFILES_CSWwxwidgetsgtk2 = $(libdir).*libwx_gtk2.*\.so\..* -PKGFILES_CSWwxwidgets-dev = $(PKGFILES_DEVEL) +# PKGFILES is catchall +# PKGFILES_CSWwxwidgets-dev CATALOGNAME_CSWwxwidgets = wxwidgets CATALOGNAME_CSWwxwidgets-dev = wxwidgets_dev 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 Jun 11 12:05:34 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 11 Jun 2013 10:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21318] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21318 http://gar.svn.sourceforge.net/gar/?rev=21318&view=rev Author: lblume Date: 2013-06-11 10:05:33 +0000 (Tue, 11 Jun 2013) Log Message: ----------- wxwidgets/trunk: Clean up wx-config from Studio parameters Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 08:38:12 UTC (rev 21317) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 10:05:33 UTC (rev 21318) @@ -122,3 +122,17 @@ LICENSE = docs/licence.txt include gar/category.mk + + +# Remove Studio-specific arch references +post-install-modulated: + gsed -i \ + -e '/^[^#]/s/-xO3[^ ]* //' \ + -e '/^[^#]/s/-xarch=[^ ]* //' \ + -e '/^[^#]/s/-xchip=[^ ]* //' \ + -e '/^[^#]/s/-norunpath[^ ]* //' \ + -e '/^[^#]/s/-lCrun[^ ]* //' \ + -e '/^[^#]/s/-lCstd[^ ]* //' \ + -e '/^[^#]/s/-mt[^ ]* //' \ + $(DESTDIR)$(bindir)/icu-config + 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 Jun 11 12:06:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 11 Jun 2013 10:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21319] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21319 http://gar.svn.sourceforge.net/gar/?rev=21319&view=rev Author: lblume Date: 2013-06-11 10:06:58 +0000 (Tue, 11 Jun 2013) Log Message: ----------- wxwidgets/trunk: Fix typo Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 10:05:33 UTC (rev 21318) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 10:06:58 UTC (rev 21319) @@ -134,5 +134,5 @@ -e '/^[^#]/s/-lCrun[^ ]* //' \ -e '/^[^#]/s/-lCstd[^ ]* //' \ -e '/^[^#]/s/-mt[^ ]* //' \ - $(DESTDIR)$(bindir)/icu-config + $(DESTDIR)$(bindir)/wx-config 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 Jun 11 12:15:51 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 11 Jun 2013 10:15:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21320] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21320 http://gar.svn.sourceforge.net/gar/?rev=21320&view=rev Author: lblume Date: 2013-06-11 10:15:51 +0000 (Tue, 11 Jun 2013) Log Message: ----------- wxwidgets/trunk: The target of the link must be modified, not the link Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 10:06:58 UTC (rev 21319) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-11 10:15:51 UTC (rev 21320) @@ -134,5 +134,5 @@ -e '/^[^#]/s/-lCrun[^ ]* //' \ -e '/^[^#]/s/-lCstd[^ ]* //' \ -e '/^[^#]/s/-mt[^ ]* //' \ - $(DESTDIR)$(bindir)/wx-config + $(DESTDIR)$(libdir)/wx/config/gtk2-unicode-release-2.8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Jun 11 17:26:29 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 11 Jun 2013 15:26:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21321] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 21321 http://gar.svn.sourceforge.net/gar/?rev=21321&view=rev Author: slowfranklin Date: 2013-06-11 15:26:27 +0000 (Tue, 11 Jun 2013) Log Message: ----------- poppler/trunk: Update to latest version Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile csw/mgar/pkg/poppler/trunk/checksums csw/mgar/pkg/poppler/trunk/files/ltmain.patch Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 10:15:51 UTC (rev 21320) +++ csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 15:26:27 UTC (rev 21321) @@ -1,7 +1,7 @@ # $Id$ NAME = poppler -VERSION = 0.14.4 +VERSION = 0.22.4 GARTYPE = v2 DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base @@ -17,60 +17,50 @@ GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PATCHFILES += missing-includes.patch +# PATCHFILES += missing-includes.patch PATCHFILES += ltmain.patch # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # BUILD64_LIBS_ONLY = 1 -BUILD64 = 1 +# BUILD64 = 1 PACKAGES += CSWlibpoppler-cpp0 -CATALOGNAME_CSWlibpoppler-cpp0 = libpoppler_cpp0 -PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.1\.0) +PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0) PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0(\.\d+)*) SPKG_DESC_CSWlibpoppler-cpp0 += $(DESCRIPTION), libpoppler-cpp.so.0 -RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibpoppler37 RUNTIME_DEP_PKGS_CSWlibpoppler-cpp0 += CSWlibiconv2 -PACKAGES += CSWlibpoppler-glib5 -CATALOGNAME_CSWlibpoppler-glib5 = libpoppler_glib5 -PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5\.0\.0) -PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5(\.\d+)*) -SPKG_DESC_CSWlibpoppler-glib5 += $(DESCRIPTION), libpoppler-glib.so.5 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWpango -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibpoppler7 -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfontconfig1 +PACKAGES += CSWlibpoppler-glib8 +PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8\.6\.0) +PKGFILES_CSWlibpoppler-glib8 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.8(\.\d+)*) +SPKG_DESC_CSWlibpoppler-glib8 += $(DESCRIPTION), libpoppler-glib.so.8 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibpoppler37 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib8 += CSWlibgio2-0-0 -PACKAGES += CSWlibpoppler7 -CATALOGNAME_CSWlibpoppler7 = libpoppler7 -PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7\.0\.0) -PKGFILES_CSWlibpoppler7 += $(call baseisadirs,$(libdir),libpoppler\.so\.7(\.\d+)*) -SPKG_DESC_CSWlibpoppler7 += $(DESCRIPTION), libpoppler.so.7 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWliblcms1 +PACKAGES += CSWlibpoppler37 +PKGFILES_CSWlibpoppler37 += $(call baseisadirs,$(libdir),libpoppler\.so\.37\.0\.0) +PKGFILES_CSWlibpoppler37 += $(call baseisadirs,$(libdir),libpoppler\.so\.37(\.\d+)*) +SPKG_DESC_CSWlibpoppler37 += $(DESCRIPTION), libpoppler.so.37 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWlibpoppler37 += CSWlibtiff3 PACKAGES += CSWpoppler-dev -CATALOGNAME_CSWpoppler-dev = poppler_dev SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler37 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0 -RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib5 +RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib8 PACKAGES += CSWpoppler SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils @@ -94,13 +84,10 @@ CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler37 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2 # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib # when relinking libpoppler-glib during install phaze @@ -111,6 +98,9 @@ CONFIGURE_ARGS = $(DIRPATHS) ### Install unsupported xpdf headers. CONFIGURE_ARGS += --enable-xpdf-headers +CONFIGURE_ARGS += --disable-poppler-qt4 +# FIXME: introspection doesn't build on amd64, couldn't figure out why +CONFIGURE_ARGS += --enable-introspection=no include gar/category.mk Modified: csw/mgar/pkg/poppler/trunk/checksums =================================================================== --- csw/mgar/pkg/poppler/trunk/checksums 2013-06-11 10:15:51 UTC (rev 21320) +++ csw/mgar/pkg/poppler/trunk/checksums 2013-06-11 15:26:27 UTC (rev 21321) @@ -1 +1 @@ -a40fe96e1115f648ce4689e667743530 poppler-0.14.4.tar.gz +49d55921ce795778c7231fe9f2fe923b poppler-0.22.4.tar.gz Modified: csw/mgar/pkg/poppler/trunk/files/ltmain.patch =================================================================== --- csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2013-06-11 10:15:51 UTC (rev 21320) +++ csw/mgar/pkg/poppler/trunk/files/ltmain.patch 2013-06-11 15:26:27 UTC (rev 21321) @@ -1,11 +1,11 @@ --- a/ltmain.sh +++ b/ltmain.sh -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +@@ -5853,7 +5853,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-xnorunpath|-norunpath) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-xnorunpath|-norunpath) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg="$func_quote_for_eval_result" func_append compile_command " $arg" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Tue Jun 11 18:08:23 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Tue, 11 Jun 2013 16:08:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21322] csw/mgar/pkg/poppler/trunk Message-ID: Revision: 21322 http://gar.svn.sourceforge.net/gar/?rev=21322&view=rev Author: slowfranklin Date: 2013-06-11 16:08:23 +0000 (Tue, 11 Jun 2013) Log Message: ----------- poppler/trunk: Re-enable inadvertently disabled 64 bit libs and delete unused patch Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/poppler/trunk/files/missing-includes.patch Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 15:26:27 UTC (rev 21321) +++ csw/mgar/pkg/poppler/trunk/Makefile 2013-06-11 16:08:23 UTC (rev 21322) @@ -17,14 +17,13 @@ GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -# PATCHFILES += missing-includes.patch PATCHFILES += ltmain.patch # UPSTREAM_MASTER_SITES = UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # BUILD64_LIBS_ONLY = 1 -# BUILD64 = 1 +BUILD64 = 1 PACKAGES += CSWlibpoppler-cpp0 PKGFILES_CSWlibpoppler-cpp0 += $(call baseisadirs,$(libdir),libpoppler-cpp\.so\.0\.2\.0) Deleted: csw/mgar/pkg/poppler/trunk/files/missing-includes.patch =================================================================== --- csw/mgar/pkg/poppler/trunk/files/missing-includes.patch 2013-06-11 15:26:27 UTC (rev 21321) +++ csw/mgar/pkg/poppler/trunk/files/missing-includes.patch 2013-06-11 16:08:23 UTC (rev 21322) @@ -1,17 +0,0 @@ ---- poppler-0.12.4/goo/gstrtod.cc.orig 2010-03-11 09:12:33.246797323 +0100 -+++ poppler-0.12.4/goo/gstrtod.cc 2010-03-11 09:13:57.881353247 +0100 -@@ -22,10 +22,10 @@ - - #include "gstrtod.h" - --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #define ascii_isspace(c) \ - (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 11 19:31:48 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 11 Jun 2013 17:31:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21323] csw/mgar/pkg/gstreamer/trunk Message-ID: Revision: 21323 http://gar.svn.sourceforge.net/gar/?rev=21323&view=rev Author: cgrzemba Date: 2013-06-11 17:31:45 +0000 (Tue, 11 Jun 2013) Log Message: ----------- gstreamer/trunk: update gstreamer for build with qt4 Modified Paths: -------------- csw/mgar/pkg/gstreamer/trunk/Makefile csw/mgar/pkg/gstreamer/trunk/checksums Modified: csw/mgar/pkg/gstreamer/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstreamer/trunk/Makefile 2013-06-11 16:08:23 UTC (rev 21322) +++ csw/mgar/pkg/gstreamer/trunk/Makefile 2013-06-11 17:31:45 UTC (rev 21323) @@ -1,5 +1,5 @@ NAME = gstreamer -VERSION = 0.10.29 +VERSION = 0.10.32 CATEGORIES = gnome GARTYPE = v2 @@ -25,16 +25,16 @@ RUNTIME_DEP_PKGS += CSWglib2 CSWggettextrt CSWlibxml2 BUILD_DEP_PKGS += CSWbison CSWflex-new CSWglib2devel CSWpkgconfig -BUILD_DEP_PKGS += CSWlibxml2devel -BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) +# BUILD_DEP_PKGS += CSWlibxml2devel +BUILD_DEP_PKGS += CSWgobject-introspection STRIP_LIBTOOL = 1 -PATCHFILES += 0001-gtk-doc.mak.patch -PATCHFILES += 0002-gtk-doc-plugins.mak.patch -PATCHFILES += 0003-Makefile.in.patch -PATCHFILES += 0004-Makefile.in.patch -PATCHFILES += 0005-Makefile.in.patch +# PATCHFILES += 0001-gtk-doc.mak.patch +# PATCHFILES += 0002-gtk-doc-plugins.mak.patch +# PATCHFILES += 0003-Makefile.in.patch +# PATCHFILES += 0004-Makefile.in.patch +# PATCHFILES += 0005-Makefile.in.patch # root/opt/csw/share/gtk-doc/html/gstreamer-0.10/gstreamer-GstBufferList.html # ./docs/plugins/html ./docs/libs/html ./docs/gst/html @@ -56,8 +56,6 @@ PKGFILES_CSWlibgstbase0-10-0 += $(call baseisadirs,$(libdir),libgstbase-0\.10\.so\.0\.25\.0) PKGFILES_CSWlibgstbase0-10-0 += $(call baseisadirs,$(libdir),libgstbase-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstbase0-10-0 += $(DESCRIPTION), libgstbase-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstbase0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstbase0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstbase0-10-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgstbase0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstbase0-10-0 += CSWlibgobject2-0-0 @@ -68,9 +66,6 @@ PKGFILES_CSWlibgstcheck0-10-0 += $(call baseisadirs,$(libdir),libgstcheck-0\.10\.so\.0\.25\.0) PKGFILES_CSWlibgstcheck0-10-0 += $(call baseisadirs,$(libdir),libgstcheck-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstcheck0-10-0 += $(DESCRIPTION), libgstcheck-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcheck0-10-0 += CSWlibglib2-0-0 @@ -80,21 +75,15 @@ PKGFILES_CSWlibgstcontroller0-10-0 += $(call baseisadirs,$(libdir),libgstcontroller-0\.10\.so\.0\.25\.0) PKGFILES_CSWlibgstcontroller0-10-0 += $(call baseisadirs,$(libdir),libgstcontroller-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstcontroller0-10-0 += $(DESCRIPTION), libgstcontroller-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstcontroller0-10-0 += CSWlibgthread2-0-0 PACKAGES += CSWlibgstdataprotocol0-10-0 CATALOGNAME_CSWlibgstdataprotocol0-10-0 = libgstdataprotocol0_10_0 PKGFILES_CSWlibgstdataprotocol0-10-0 += $(call baseisadirs,$(libdir),libgstdataprotocol-0\.10\.so\.0\.25\.0) PKGFILES_CSWlibgstdataprotocol0-10-0 += $(call baseisadirs,$(libdir),libgstdataprotocol-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstdataprotocol0-10-0 += $(DESCRIPTION), libgstdataprotocol-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstdataprotocol0-10-0 += CSWlibglib2-0-0 @@ -104,9 +93,6 @@ PKGFILES_CSWlibgstnet0-10-0 += $(call baseisadirs,$(libdir),libgstnet-0\.10\.so\.0\.25\.0) PKGFILES_CSWlibgstnet0-10-0 += $(call baseisadirs,$(libdir),libgstnet-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstnet0-10-0 += $(DESCRIPTION), libgstnet-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstnet0-10-0 += CSWlibglib2-0-0 @@ -138,7 +124,6 @@ PACKAGES += CSWgstreamer SPKG_DESC_CSWgstreamer += $(DESCRIPTION), base RUNTIME_DEP_PKGS_CSWgstreamer += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgstreamer += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgstreamer += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgstreamer += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgstreamer += CSWlibglib2-0-0 Modified: csw/mgar/pkg/gstreamer/trunk/checksums =================================================================== --- csw/mgar/pkg/gstreamer/trunk/checksums 2013-06-11 16:08:23 UTC (rev 21322) +++ csw/mgar/pkg/gstreamer/trunk/checksums 2013-06-11 17:31:45 UTC (rev 21323) @@ -1 +1 @@ -5238b196a5e7bbc53d57c97b634d31cf gstreamer-0.10.29.tar.gz +bcc72c77bf00e183102f6302e627aa20 gstreamer-0.10.32.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 Jun 12 14:38:32 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 12 Jun 2013 12:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21324] csw/mgar/pkg/libyaml/trunk Message-ID: Revision: 21324 http://gar.svn.sourceforge.net/gar/?rev=21324&view=rev Author: lblume Date: 2013-06-12 12:38:30 +0000 (Wed, 12 Jun 2013) Log Message: ----------- libyaml/trunk: Bump version to 0.1.4; clean-up and reorganize Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile csw/mgar/pkg/libyaml/trunk/checksums Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-11 17:31:45 UTC (rev 21323) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-12 12:38:30 UTC (rev 21324) @@ -2,18 +2,38 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -NAME = libyaml -VERSION = 0.1.3 +NAME = libyaml +VERSION = 0.1.4 GARTYPE = v2 -DESCRIPTION = a YAML 1.1 parser and emitter written in C + +DESCRIPTION = A YAML 1.1 parser and emitter written in C define BLURB endef -SPKG_SOURCEURL = http://pyyaml.org/wiki/LibYAML?version=20 + +VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 MASTER_SITES = http://pyyaml.org/download/libyaml/ -DISTFILES = yaml-$(VERSION).tar.gz +DISTFILES = yaml-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = + +PACKAGES += CSWlibyaml0-2 +CATALOGNAME_CSWlibyaml0-2 = libyaml0_2 +PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2\.0\.2) +PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibyaml0-2 += $(DESCRIPTION), libyaml-0.so.2 +OBSOLETED_BY_CSWlibyaml0-2 = CSWlibyaml + + +PACKAGES += CSWlibyaml-dev +CATALOGNAME_CSWlibyaml-dev = libyaml_dev +SPKG_DESC_CSWlibyaml-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWlibyaml-dev += CSWlibyaml0-2 +# PKGFILES is catchall + +CATALOGNAME_CSWlibyaml = libyaml_stub + CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 WORKSRC = $(WORKDIR)/yaml-$(VERSION) + include gar/category.mk Modified: csw/mgar/pkg/libyaml/trunk/checksums =================================================================== --- csw/mgar/pkg/libyaml/trunk/checksums 2013-06-11 17:31:45 UTC (rev 21323) +++ csw/mgar/pkg/libyaml/trunk/checksums 2013-06-12 12:38:30 UTC (rev 21324) @@ -1 +1 @@ -b8ab9064e8e0330423fe640de76608cd download/yaml-0.1.3.tar.gz +36c852831d02cf90508c29852361d01b yaml-0.1.4.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 Jun 12 15:52:19 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 12 Jun 2013 13:52:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21325] csw/mgar/pkg/libyaml/branches Message-ID: Revision: 21325 http://gar.svn.sourceforge.net/gar/?rev=21325&view=rev Author: lblume Date: 2013-06-12 13:52:17 +0000 (Wed, 12 Jun 2013) Log Message: ----------- libyaml/branches/libyaml0_1/trunk: Add a backward compatibility lib for the old .so.1 (v0.1.2) Added Paths: ----------- csw/mgar/pkg/libyaml/branches/libyaml0_1/ csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile csw/mgar/pkg/libyaml/branches/libyaml0_1/branches/ csw/mgar/pkg/libyaml/branches/libyaml0_1/tags/ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/files/ Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile (rev 0) +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile 2013-06-12 13:52:17 UTC (rev 21325) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-12 13:52:17 UTC (rev 21325) @@ -0,0 +1,32 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = libyaml +VERSION = 0.1.2 +GARTYPE = v2 + +DESCRIPTION = A YAML 1.1 parser and emitter written in C +define BLURB +endef + +VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 +MASTER_SITES = http://pyyaml.org/download/libyaml/ +DISTFILES = yaml-$(VERSION).tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +TEST_SCRIPTS = + +PACKAGES += CSWlibyaml0-1 +CATALOGNAME_CSWlibyaml0-1 = libyaml0_1 +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1\.1\.0) +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibyaml0-1 += $(DESCRIPTION), libyaml-0.so.1 +OBSOLETED_BY_CSWlibyaml0-1 = CSWlibyaml + +CATALOGNAME_CSWlibyaml = libyaml_stub + +CONFIGURE_ARGS = $(DIRPATHS) +BUILD64_LIBS_ONLY = 1 +WORKSRC = $(WORKDIR)/yaml-$(VERSION) + +include gar/category.mk Property changes on: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums (rev 0) +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums 2013-06-12 13:52:17 UTC (rev 21325) @@ -0,0 +1 @@ +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.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 Wed Jun 12 15:54:42 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 12 Jun 2013 13:54:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21326] csw/mgar/pkg/libyaml/trunk/Makefile Message-ID: Revision: 21326 http://gar.svn.sourceforge.net/gar/?rev=21326&view=rev Author: lblume Date: 2013-06-12 13:54:42 +0000 (Wed, 12 Jun 2013) Log Message: ----------- libyaml/trunk: Remove stub package since it should be a dep of the compat 0_1 package Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-12 13:52:17 UTC (rev 21325) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-12 13:54:42 UTC (rev 21326) @@ -21,7 +21,6 @@ PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2\.0\.2) PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2(\.\d+)*) SPKG_DESC_CSWlibyaml0-2 += $(DESCRIPTION), libyaml-0.so.2 -OBSOLETED_BY_CSWlibyaml0-2 = CSWlibyaml PACKAGES += CSWlibyaml-dev @@ -30,8 +29,6 @@ RUNTIME_DEP_PKGS_CSWlibyaml-dev += CSWlibyaml0-2 # PKGFILES is catchall -CATALOGNAME_CSWlibyaml = libyaml_stub - CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 WORKSRC = $(WORKDIR)/yaml-$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 12 15:57:29 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Jun 2013 13:57:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21327] csw/mgar/pkg/adns/trunk/Makefile Message-ID: Revision: 21327 http://gar.svn.sourceforge.net/gar/?rev=21327&view=rev Author: dmichelsen Date: 2013-06-12 13:57:29 +0000 (Wed, 12 Jun 2013) Log Message: ----------- adns/trunk: Enable 64 bit binaries Modified Paths: -------------- csw/mgar/pkg/adns/trunk/Makefile Modified: csw/mgar/pkg/adns/trunk/Makefile =================================================================== --- csw/mgar/pkg/adns/trunk/Makefile 2013-06-12 13:54:42 UTC (rev 21326) +++ csw/mgar/pkg/adns/trunk/Makefile 2013-06-12 13:57:29 UTC (rev 21327) @@ -28,7 +28,8 @@ SPKG_DESC_CSWlibadns1 = Advanced, easy to use, asynchronous-capable DNS client library, libadns.so.1 PKGFILES_CSWlibadns1 += $(call pkgfiles_lib,libadns.so.1) -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 BUILD_OVERRIDE_VARS = MKSHLIB_1 MKSHLIB_3 BUILD_OVERRIDE_VAR_MKSHLIB_1 = $(CC) $(LDFLAGS) -G -h $$(SHLIBSONAME) -o This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From laurent at opencsw.org Wed Jun 12 15:58:35 2013 From: laurent at opencsw.org (Laurent Blume) Date: Wed, 12 Jun 2013 15:58:35 +0200 Subject: [csw-devel] SF.net SVN: gar:[21325] csw/mgar/pkg/libyaml/branches In-Reply-To: References: Message-ID: <51B87E8B.6090402@opencsw.org> Can somebody please review this? It's a libyaml0_1 branch in libyaml. the idea is that libyaml0_1 replaces the current libyaml (which contains the .so.1), and the new libyaml provides libyaml0_2 and libyaml_dev. The idea is to provide a seamless replacement of the old package (which has ruby191 and some Python stuff depending on it), while providing the newer .so.2 one. Thanks, Laurent On 12/06/13 15:52, lblume at users.sourceforge.net wrote: > Revision: 21325 > http://gar.svn.sourceforge.net/gar/?rev=21325&view=rev > Author: lblume > Date: 2013-06-12 13:52:17 +0000 (Wed, 12 Jun 2013) > Log Message: > ----------- > libyaml/branches/libyaml0_1/trunk: Add a backward compatibility lib for the old .so.1 (v0.1.2) > > Added Paths: > ----------- > csw/mgar/pkg/libyaml/branches/libyaml0_1/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile > csw/mgar/pkg/libyaml/branches/libyaml0_1/branches/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/tags/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/files/ > > Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile > =================================================================== > --- csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile (rev 0) > +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile 2013-06-12 13:52:17 UTC (rev 21325) > @@ -0,0 +1,2 @@ > +%: > + $(MAKE) -C trunk $* > > > Property changes on: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk > ___________________________________________________________________ > Added: svn:ignore > + work > > > Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-12 13:52:17 UTC (rev 21325) > @@ -0,0 +1,32 @@ > +# Copyright 2009 OpenCSW > +# Distributed under the terms of the GNU General Public License v2 > +# $Id$ > + > +NAME = libyaml > +VERSION = 0.1.2 > +GARTYPE = v2 > + > +DESCRIPTION = A YAML 1.1 parser and emitter written in C > +define BLURB > +endef > + > +VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 > +MASTER_SITES = http://pyyaml.org/download/libyaml/ > +DISTFILES = yaml-$(VERSION).tar.gz > +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz > +TEST_SCRIPTS = > + > +PACKAGES += CSWlibyaml0-1 > +CATALOGNAME_CSWlibyaml0-1 = libyaml0_1 > +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1\.1\.0) > +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1(\.\d+)*) > +SPKG_DESC_CSWlibyaml0-1 += $(DESCRIPTION), libyaml-0.so.1 > +OBSOLETED_BY_CSWlibyaml0-1 = CSWlibyaml > + > +CATALOGNAME_CSWlibyaml = libyaml_stub > + > +CONFIGURE_ARGS = $(DIRPATHS) > +BUILD64_LIBS_ONLY = 1 > +WORKSRC = $(WORKDIR)/yaml-$(VERSION) > + > +include gar/category.mk > > > Property changes on: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile > ___________________________________________________________________ > Added: svn:keywords > + Id > > Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums > =================================================================== > --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums (rev 0) > +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums 2013-06-12 13:52:17 UTC (rev 21325) > @@ -0,0 +1 @@ > +f6c9b5c2b0f6919abd79f5fd059b01dc yaml-0.1.2.tar.gz > > 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 dmichelsen at users.sourceforge.net Wed Jun 12 16:43:42 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Jun 2013 14:43:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21328] csw/mgar/pkg Message-ID: Revision: 21328 http://gar.svn.sourceforge.net/gar/?rev=21328&view=rev Author: dmichelsen Date: 2013-06-12 14:43:40 +0000 (Wed, 12 Jun 2013) Log Message: ----------- openssh-ldap-publickey/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/openssh-ldap-publickey/ csw/mgar/pkg/openssh-ldap-publickey/Makefile csw/mgar/pkg/openssh-ldap-publickey/branches/ csw/mgar/pkg/openssh-ldap-publickey/tags/ csw/mgar/pkg/openssh-ldap-publickey/trunk/ csw/mgar/pkg/openssh-ldap-publickey/trunk/Makefile csw/mgar/pkg/openssh-ldap-publickey/trunk/checksums csw/mgar/pkg/openssh-ldap-publickey/trunk/files/ Added: csw/mgar/pkg/openssh-ldap-publickey/Makefile =================================================================== --- csw/mgar/pkg/openssh-ldap-publickey/Makefile (rev 0) +++ csw/mgar/pkg/openssh-ldap-publickey/Makefile 2013-06-12 14:43:40 UTC (rev 21328) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/openssh-ldap-publickey/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/openssh-ldap-publickey/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh-ldap-publickey/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openssh-ldap-publickey/trunk/Makefile 2013-06-12 14:43:40 UTC (rev 21328) @@ -0,0 +1,47 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = openssh-ldap-publickey +VERSION = 0.2 +GARTYPE = v2 + +DESCRIPTION = Wrapper for OpenSSH to store public keys inside the OpenLDAP entry + +GITHUB_USER = AndriiGrytsenko +MASTER_SITES = $(GITHUB_MIRROR) +DISTNAME = $(GITHUB_USER)-$(NAME)-51da7d8 +DISTFILES = $(NAME)-$(VERSION)$(GITHUB_BALL_EXT) + +PACKAGES += CSWopenssh-ldap-publickey +SPKG_DESC_CSWopenssh-ldap-publickey = Wrapper for OpenSSH to store public keys inside the OpenLDAP entry +RUNTIME_DEP_PKGS_CSWopenssh-ldap-publickey += CSWpm-ldap +CHECKPKG_OVERRIDES_CSWopenssh-ldap-publickey += surplus-dependency|CSWpm-ldap +ARCHALL_CSWopenssh-ldap-publickey = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +REINPLACEMENTS += cswperl +REINPLACE_MATCH_cswperl = /usr/bin/perl +REINPLACE_WITH_cswperl = $(bindir)/perl +REINPLACE_FILES_cswperl += bin/openssh-ldap-publickey + +REINPLACEMENTS += ldapconf +REINPLACE_MATCH_ldapconf = /etc/ldap.conf +REINPLACE_WITH_ldapconf = $(sysconfdir)/ldap.conf +REINPLACE_FILES_ldapconf += bin/openssh-ldap-publickey + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(bindir) + ginstall -m 0755 $(WORKSRC)/bin/openssh-ldap-publickey $(DESTDIR)$(bindir)/openssh-ldap-publickey + ginstall -d $(PKGROOT)$(sysconfdir)/openldap/schema + ginstall -m 0644 $(WORKSRC)/misc/openssh-lpk-openldap.schema $(PKGROOT)$(sysconfdir)/openldap/schema/openssh-lpk-openldap.schema + ginstall -d $(PKGROOT)$(sharedstatedir)/doc/$(CATALOGNAME) + ginstall -m 0644 $(WORKSRC)/README.md $(PKGROOT)$(sharedstatedir)/doc/$(CATALOGNAME) + ginstall -d $(PKGROOT)$(mandir)/man8 + ginstall -m 0644 $(WORKSRC)/man/openssh-ldap-publickey.8 $(PKGROOT)$(mandir)/man8 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/openssh-ldap-publickey/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/openssh-ldap-publickey/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh-ldap-publickey/trunk/checksums (rev 0) +++ csw/mgar/pkg/openssh-ldap-publickey/trunk/checksums 2013-06-12 14:43:40 UTC (rev 21328) @@ -0,0 +1 @@ +d352a9b6304f94266c9f7edc6d84793f openssh-ldap-publickey-0.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 Wed Jun 12 17:22:06 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 12 Jun 2013 15:22:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21329] csw/mgar/pkg/libyaml/trunk/Makefile Message-ID: Revision: 21329 http://gar.svn.sourceforge.net/gar/?rev=21329&view=rev Author: lblume Date: 2013-06-12 15:22:04 +0000 (Wed, 12 Jun 2013) Log Message: ----------- libyaml/trunk: Add an override until libyaml is replaced Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-12 14:43:40 UTC (rev 21328) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-12 15:22:04 UTC (rev 21329) @@ -29,6 +29,11 @@ RUNTIME_DEP_PKGS_CSWlibyaml-dev += CSWlibyaml0-2 # PKGFILES is catchall +# CSWlibyaml used to contain the dev bits. +# It is an old packages that was replaced by CSWlibyaml0_1 +CHECKPKG_OVERRIDES_CSWlibyaml-dev += file-collision|/opt/csw/lib/libyaml.so|CSWlibyaml|CSWlibyaml-dev +CHECKPKG_OVERRIDES_CSWlibyaml-dev += file-collision|/opt/csw/include/yaml.h|CSWlibyaml|CSWlibyaml-dev + CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 WORKSRC = $(WORKDIR)/yaml-$(VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Jun 13 12:38:56 2013 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 13 Jun 2013 11:38:56 +0100 Subject: [csw-devel] SF.net SVN: gar:[21325] csw/mgar/pkg/libyaml/branches In-Reply-To: References: Message-ID: 2013/6/12 > > Revision: 21325 > http://gar.svn.sourceforge.net/gar/?rev=21325&view=rev > Author: lblume > Date: 2013-06-12 13:52:17 +0000 (Wed, 12 Jun 2013) > Log Message: > ----------- > libyaml/branches/libyaml0_1/trunk: Add a backward compatibility lib for the old .so.1 (v0.1.2) > > Added Paths: > ----------- > csw/mgar/pkg/libyaml/branches/libyaml0_1/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile > csw/mgar/pkg/libyaml/branches/libyaml0_1/branches/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/tags/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/ > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/checksums > csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/files/ > > Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile > =================================================================== > --- csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile (rev 0) > +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/Makefile 2013-06-12 13:52:17 UTC (rev 21325) > @@ -0,0 +1,2 @@ > +%: > + $(MAKE) -C trunk $* > > > Property changes on: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk > ___________________________________________________________________ > Added: svn:ignore > + work > > > Added: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile (rev 0) > +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-12 13:52:17 UTC (rev 21325) > @@ -0,0 +1,32 @@ > +# Copyright 2009 OpenCSW > +# Distributed under the terms of the GNU General Public License v2 > +# $Id$ > + > +NAME = libyaml > +VERSION = 0.1.2 > +GARTYPE = v2 > + > +DESCRIPTION = A YAML 1.1 parser and emitter written in C > +define BLURB > +endef The BLURB thing is not necessary, we don't use it for anything. > + > +VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 > +MASTER_SITES = http://pyyaml.org/download/libyaml/ > +DISTFILES = yaml-$(VERSION).tar.gz > +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz UFILES_REGEX is automated. > +TEST_SCRIPTS = > + > +PACKAGES += CSWlibyaml0-1 > +CATALOGNAME_CSWlibyaml0-1 = libyaml0_1 > +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1\.1\.0) The above line is not necessary -- covered by the one below. > +PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1(\.\d+)*) > +SPKG_DESC_CSWlibyaml0-1 += $(DESCRIPTION), libyaml-0.so.1 > +OBSOLETED_BY_CSWlibyaml0-1 = CSWlibyaml Looks good. > +CATALOGNAME_CSWlibyaml = libyaml_stub > + > +CONFIGURE_ARGS = $(DIRPATHS) > +BUILD64_LIBS_ONLY = 1 > +WORKSRC = $(WORKDIR)/yaml-$(VERSION) I forget why the above line is necessary. In most cases, you don't need to set WORKSRC. Maybe you can set DISTNAME instead? From laurent at opencsw.org Thu Jun 13 13:59:17 2013 From: laurent at opencsw.org (Laurent Blume) Date: Thu, 13 Jun 2013 13:59:17 +0200 Subject: [csw-devel] SF.net SVN: gar:[21325] csw/mgar/pkg/libyaml/branches In-Reply-To: References: Message-ID: <51B9B415.9080000@opencsw.org> On 13/06/13 12:38, Maciej (Matchek) Blizi?ski wrote: > The BLURB thing is not necessary, we don't use it for anything. > > UFILES_REGEX is automated. Oh okay, thanks, leftovers, I'll remove. > The above line is not necessary -- covered by the one below. Straight out of checkpkg :-) I thought it was weird, but hey, I trust checkpkg! > I forget why the above line is necessary. In most cases, you don't > need to set WORKSRC. Maybe you can set DISTNAME instead? Probably also a leftover. It was an old recipe, originally I only wanted to add 64 bit support (I need it as a dependency for PECL yaml for my 64 bit PHP), then I thought, hey, why not bump it, then noticed the .so number had changed, and well, since it was building smoothly anyway... Dagobert already had worked on it years ago but not published. Laurent From lblume at users.sourceforge.net Thu Jun 13 14:02:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 13 Jun 2013 12:02:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21330] csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/ Makefile Message-ID: Revision: 21330 http://gar.svn.sourceforge.net/gar/?rev=21330&view=rev Author: lblume Date: 2013-06-13 12:02:00 +0000 (Thu, 13 Jun 2013) Log Message: ----------- libyaml/branches/libyaml0_1/trunk: Additionnal cleanup of old lines Modified Paths: -------------- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile Modified: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-12 15:22:04 UTC (rev 21329) +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-13 12:02:00 UTC (rev 21330) @@ -7,18 +7,14 @@ GARTYPE = v2 DESCRIPTION = A YAML 1.1 parser and emitter written in C -define BLURB -endef VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 MASTER_SITES = http://pyyaml.org/download/libyaml/ DISTFILES = yaml-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = PACKAGES += CSWlibyaml0-1 CATALOGNAME_CSWlibyaml0-1 = libyaml0_1 -PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1\.1\.0) PKGFILES_CSWlibyaml0-1 += $(call baseisadirs,$(libdir),libyaml-0\.so\.1(\.\d+)*) SPKG_DESC_CSWlibyaml0-1 += $(DESCRIPTION), libyaml-0.so.1 OBSOLETED_BY_CSWlibyaml0-1 = CSWlibyaml @@ -27,6 +23,5 @@ CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 -WORKSRC = $(WORKDIR)/yaml-$(VERSION) 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 Thu Jun 13 14:11:21 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 13 Jun 2013 12:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21331] csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/ Makefile Message-ID: Revision: 21331 http://gar.svn.sourceforge.net/gar/?rev=21331&view=rev Author: lblume Date: 2013-06-13 12:11:19 +0000 (Thu, 13 Jun 2013) Log Message: ----------- libyaml/branches/libyaml0_1/trunk: Add proper DISTNAME Modified Paths: -------------- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile Modified: csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-13 12:02:00 UTC (rev 21330) +++ csw/mgar/pkg/libyaml/branches/libyaml0_1/trunk/Makefile 2013-06-13 12:11:19 UTC (rev 21331) @@ -10,7 +10,8 @@ VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 MASTER_SITES = http://pyyaml.org/download/libyaml/ -DISTFILES = yaml-$(VERSION).tar.gz +DISTNAME = yaml-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = PACKAGES += CSWlibyaml0-1 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 Jun 13 14:12:47 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 13 Jun 2013 12:12:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21332] csw/mgar/pkg/libyaml/trunk/Makefile Message-ID: Revision: 21332 http://gar.svn.sourceforge.net/gar/?rev=21332&view=rev Author: lblume Date: 2013-06-13 12:12:47 +0000 (Thu, 13 Jun 2013) Log Message: ----------- libyaml/trunk: Remove old lines, add DISTNAME Modified Paths: -------------- csw/mgar/pkg/libyaml/trunk/Makefile Modified: csw/mgar/pkg/libyaml/trunk/Makefile =================================================================== --- csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-13 12:11:19 UTC (rev 21331) +++ csw/mgar/pkg/libyaml/trunk/Makefile 2013-06-13 12:12:47 UTC (rev 21332) @@ -7,22 +7,18 @@ GARTYPE = v2 DESCRIPTION = A YAML 1.1 parser and emitter written in C -define BLURB -endef VENDOR_URL = http://pyyaml.org/wiki/LibYAML?version=20 MASTER_SITES = http://pyyaml.org/download/libyaml/ -DISTFILES = yaml-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTNAME = yaml-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz TEST_SCRIPTS = PACKAGES += CSWlibyaml0-2 CATALOGNAME_CSWlibyaml0-2 = libyaml0_2 -PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2\.0\.2) PKGFILES_CSWlibyaml0-2 += $(call baseisadirs,$(libdir),libyaml-0\.so\.2(\.\d+)*) SPKG_DESC_CSWlibyaml0-2 += $(DESCRIPTION), libyaml-0.so.2 - PACKAGES += CSWlibyaml-dev CATALOGNAME_CSWlibyaml-dev = libyaml_dev SPKG_DESC_CSWlibyaml-dev += $(DESCRIPTION), development files @@ -36,6 +32,5 @@ CONFIGURE_ARGS = $(DIRPATHS) BUILD64_LIBS_ONLY = 1 -WORKSRC = $(WORKDIR)/yaml-$(VERSION) 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 Thu Jun 13 18:13:49 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 13 Jun 2013 16:13:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21333] csw/mgar/pkg/scummvm-tools/trunk Message-ID: Revision: 21333 http://gar.svn.sourceforge.net/gar/?rev=21333&view=rev Author: lblume Date: 2013-06-13 16:13:47 +0000 (Thu, 13 Jun 2013) Log Message: ----------- scummvm-tools/trunk: Add necessary patches to build with Studio; add dependencies Modified Paths: -------------- csw/mgar/pkg/scummvm-tools/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch Modified: csw/mgar/pkg/scummvm-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/Makefile 2013-06-13 12:12:47 UTC (rev 21332) +++ csw/mgar/pkg/scummvm-tools/trunk/Makefile 2013-06-13 16:13:47 UTC (rev 21333) @@ -15,7 +15,39 @@ SF_PROJECT = scummvm DISTFILES = $(DISTNAME).zip -CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = SOS12U3 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibz1 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWscummvm-tools += CSWwxwidgetsgtk2 + +TEST_SCRIPTS = + +PATCHFILES += 0001-teach-configure-about-studio.patch +PATCHFILES += 0002-avoid-deque-constructor-for-studio.patch +PATCHFILES += 0003-fix-wxT-macro-on-split-lines.patch +PATCHFILES += 0004-install-should-create-path.patch + +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += --bindir=$(bindir) +CONFIGURE_ARGS += --mandir=$(mandir) +CONFIGURE_ARGS += --datadir=$(datadir) +CONFIGURE_ARGS += --libdir=$(libdir) + +EXTRA_CXXFLAGS += -norunpath +EXTRA_LDFLAGS += -norunpath +EXTRA_LD_OPTIONS += -z nolazyload -B direct + +# To make sure make install does not try to use Solaris' install +EXTRA_INSTALL_EXPORTS = INSTALL +INSTALL = ginstall + include gar/category.mk Added: csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0001-teach-configure-about-studio.patch 2013-06-13 16:13:47 UTC (rev 21333) @@ -0,0 +1,53 @@ +--- a/configure Sun May 26 23:14:49 2013 ++++ b/configure Tue Jun 11 22:19:24 2013 +@@ -752,7 +752,7 @@ + if test -n "$_host"; then + compilers="$_host_alias-g++ $_host_alias-c++ $_host-g++ $_host-c++" + else +- compilers="g++ c++" ++ compilers="g++ c++ CC" + fi + + # Iterate over all candidates, pick the first working one +@@ -812,11 +812,9 @@ + cxx_version="not found" + cxx_verc_fail=yes + fi +- echo non-gcc compiler version ${cxx_version} + else + cxx_version="not found" + cxx_verc_fail=yes +- echo found non-gcc compiler version ${cxx_version} + fi + + case $_host_os in +@@ -836,6 +834,20 @@ + ;; + esac + ;; ++ solaris*) ++ cxx_version=`( $CXX -V ) 2>&1` ++ cxx_version="`echo "${cxx_version}" | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`" ++ ++ case $cxx_version in ++ 5.1[0-2]) ++ cxx_verc_fail=no ++ ;; ++ *) ++ cxx_version="$cxx_version, bad" ++ cxx_verc_fail=yes ++ ;; ++ esac ++ ;; + *) + cxx_version="$cxx_version, bad" + cxx_verc_fail=yes +@@ -850,6 +862,8 @@ + echo "The version of your compiler is not supported at this time" + echo "Please ensure you are using GCC >= 2.95" + exit 1 ++else ++ echo found non-gcc compiler version ${cxx_version} + fi + + # Added: csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-13 16:13:47 UTC (rev 21333) @@ -0,0 +1,16 @@ +--- a/scummvm-tools-cli.cpp Sun May 26 23:14:49 2013 ++++ b/scummvm-tools-cli.cpp Thu Jun 13 14:43:56 2013 +@@ -40,8 +40,13 @@ + return 2; + } + ++// If using Solaris Studio ++#if defined(__sun) && !defined(__GNUC__) ++ std::deque arguments; for (int i = 1; i < argc; i++); ++#else + std::deque arguments(argv, argv + argc); + arguments.pop_front(); // Pop our own name ++#endif + + ToolType type = TOOLTYPE_ALL; + Added: csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0003-fix-wxT-macro-on-split-lines.patch 2013-06-13 16:13:47 UTC (rev 21333) @@ -0,0 +1,30 @@ +--- a/gui/pages.cpp Sun May 26 23:14:49 2013 ++++ b/gui/pages.cpp Thu Jun 13 14:48:39 2013 +@@ -848,10 +848,10 @@ + ) { + wxMessageDialog *msgDialog = new wxMessageDialog( + NULL, +- wxT("The lame executable could not be found. It is needed to compress files to MP3. " +- "You can either proceed to the advanced audio settings page and give the path to lame " +- "or you can select another audio format to compress to.\n\n" +- "Do you want to proceed to the advanced audio settings page?"), ++ wxT("The lame executable could not be found. It is needed to compress files to MP3. ") ++ wxT("You can either proceed to the advanced audio settings page and give the path to lame ") ++ wxT("or you can select another audio format to compress to.\n\n") ++ wxT("Do you want to proceed to the advanced audio settings page?"), + wxT("lame not found"), + wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION + ); +@@ -1050,9 +1050,9 @@ + if (!Configuration::isLamePathValid(lamePath->GetPath())) { + wxMessageDialog *msgDialog = new wxMessageDialog( + NULL, +- wxT("The lame executable could not be found. It is needed to compress files to MP3. " +- "If you want to use MP3 compression you need to select a valid lame executable. " +- "Otherwise you can go back to the audio format selection and select another format."), ++ wxT("The lame executable could not be found. It is needed to compress files to MP3. ") ++ wxT("If you want to use MP3 compression you need to select a valid lame executable. ") ++ wxT("Otherwise you can go back to the audio format selection and select another format."), + wxT("lame not found"), + wxOK | wxICON_EXCLAMATION + ); Added: csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch (rev 0) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0004-install-should-create-path.patch 2013-06-13 16:13:47 UTC (rev 21333) @@ -0,0 +1,11 @@ +--- a/Makefile.common Jun 13 17:35:56 2013 ++++ b/Makefile.common Thu Jun 13 17:37:20 2013 +@@ -313,6 +313,8 @@ + all: $(TARGETS) + + install: $(TARGETS) ++ $(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools + for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done + $(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools + $(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools 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 Jun 13 23:09:49 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 13 Jun 2013 21:09:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[21334] csw/mgar/gar/v2/lib/python Message-ID: Revision: 21334 http://gar.svn.sourceforge.net/gar/?rev=21334&view=rev Author: chninkel Date: 2013-06-13 21:09:47 +0000 (Thu, 13 Jun 2013) Log Message: ----------- gar/v2: checkpkg: remove ldd info retrieval code that is not used anymore Modified Paths: -------------- csw/mgar/gar/v2/lib/python/inspective_package.py csw/mgar/gar/v2/lib/python/inspective_package_test.py csw/mgar/gar/v2/lib/python/package_checks_test.py csw/mgar/gar/v2/lib/python/package_stats.py csw/mgar/gar/v2/lib/python/package_stats_test.py csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py csw/mgar/gar/v2/lib/python/testdata/neon_stats.py csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py csw/mgar/gar/v2/lib/python/testdata/tree_stats.py csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py Modified: csw/mgar/gar/v2/lib/python/inspective_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/inspective_package.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -350,55 +350,6 @@ return binaries_elf_info - def GetLddMinusRlines(self): - """Returns ldd -r output.""" - pkginfo_arch = self.GetParsedPkginfo()['ARCH'] - binaries = [ f['path'] for f in self.GetFilesMetadata() - if sharedlib_utils.IsBinary(f) and - common_constants.MACHINE_ID_METADATA[f['machine_id']]['type'] == pkginfo_arch ] - base_dir = self.GetBasedir() - ldd_output = {} - for binary in binaries: - binary_abspath = os.path.join(self.directory, self.GetFilesDir(), binary) - if base_dir: - binary = os.path.join(base_dir, binary) - - # this could be potentially moved into the DirectoryFormatPackage class. - # ldd needs the binary to be executable - os.chmod(binary_abspath, 0755) - args = ["ldd", "-Ur", binary_abspath] - # ldd can be stuck while ran on a some binaries, so we define - # a timeout (problem encountered with uconv) - retcode, stdout, stderr = shell.ShellCommand(args, timeout=10, allow_error=True) - if retcode: - # There three cases where we will ignore an ldd error - # - if we are trying to analyze a 64 bits binary on a Solaris 9 x86 - # solaris 9 exists only in 32 bits, so we can't do this - # We ignore the error as it is likely that the ldd infos will be - # the same on the 32 bits binaries - # - if we are trying to analyze a statically linked binaries - # we care only about dynamic binary so we ignore the error - # - uname_info = os.uname() - if ((uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and - '/amd64/' in binary_abspath and - 'has wrong class or data encoding' in stderr) - or 'file is not a dynamic executable or shared object' in stderr): - ldd_output[binary] = [] - continue - - raise package.SystemUtilityError("%s returned an error: %s" % (args, stderr)) - - ldd_info = [] - for line in stdout.splitlines(): - result = self._ParseLddDashRline(line, binary_abspath) - if result: - ldd_info.append(result) - - ldd_output[binary] = ldd_info - - return ldd_output - def _ParseNmSymLine(self, line): re_defined_symbol = re.compile('[0-9]+ [ABDFNSTU] \S+') m = re_defined_symbol.match(line) @@ -518,62 +469,6 @@ return elfdump_data, section - def _ParseLddDashRline(self, line, binary=None): - found_re = r"^\t(?P\S+)\s+=>\s+(?P\S+)" - symbol_not_found_re = (r"^\tsymbol not found:\s(?P\S+)\s+" - r"\((?P\S+)\)") - only_so = r"^\t(?P\S+)$" - version_so = (r'^\t(?P\S+) ' - r'\((?P\S+)\) =>\t \(version not found\)') - stv_protected = (r'^\trelocation \S+ symbol: (?P\S+): ' - r'file (?P\S+): ' - r'relocation bound to a symbol ' - r'with STV_PROTECTED visibility$') - sizes_differ = (r'^\trelocation \S+ sizes differ: ' - r'(?P\S+)$') - sizes_info = (r'^\t\t\(file (?P\S+)' - r' size=(?P0x\w+); ' - r'file (?P\S+) size=(?P0x\w+)\)$') - sizes_one_used = (r'^\t\t(?P\S+) size used; ' - r'possible insufficient data copied$') - unreferenced_object = (r'^\s*unreferenced object=(?P.*);' - r' unused dependency of (?P.*)$') - unused_object = (r'^\s*unused object=.*$') - unused_search_path = (r'^\s*unused search path=.*' - r' \((?:LD_LIBRARY_PATH|RUNPATH/RPATH from file .*)\)$') - move_offset_error = (r'^\tmove (?P\d+) offset invalid: ' - r'\(unknown\): offset=(?P0x[0-9a-f]+) ' - 'lies outside memory image; move discarded') - relocation_error = (r'relocation R_(386|AMD64|X86_64|SPARC)_\w+ ' - r'sizes differ: (?P.*)' - r'|\t\t\(file .* size=0(?:x[0-9a-f]+)?; file .*' - r'size=0x(?:[0-9a-f]+)?\)' - r'|\t.* size used; possible data truncation') - copy_relocation_error = (r'\tsymbol (?P\S+):' - r' file \S+: copy relocation symbol' - r' may have been displacement relocated') - blank_line = (r'^\s*$') - common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" - % (found_re, symbol_not_found_re, only_so, version_so, - stv_protected, sizes_differ, sizes_info, - sizes_one_used, unreferenced_object, unused_object, - unused_search_path, blank_line, move_offset_error, - relocation_error, copy_relocation_error)) - m = re.match(common_re, line) - response = None - if m: - response = {} - d = m.groupdict() - if "binary" in d and d["binary"] and binary == d["binary"]: - response["state"] = "soname-unused" - response["soname"] = os.path.basename(d["object"]) - - else: - raise package.StdoutSyntaxError("Could not parse %s with %s" - % (repr(line), common_re)) - - return response - def GetDependencies(self): """Gets dependencies information. Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/inspective_package_test.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -12,19 +12,6 @@ import tempfile import io -LDD_R_OUTPUT_1 = """\tlibc.so.1 => /lib/libc.so.1 -\tsymbol not found: check_encoding_conversion_args (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tsymbol not found: LocalToUtf (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tsymbol not found: UtfToLocal (/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so) -\tunreferenced object=/lib/libsocket.so.1; unused dependency of /opt/csw/lib/libfoo.so.1 -\tlibm.so.2 => /lib/libm.so.2 -\t/usr/lib/secure/s8_preload.so.1 -\tlibXext.so.0 (SUNW_1.1) =>\t (version not found) -\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: relocation bound to a symbol with STV_PROTECTED visibility -\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget -\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/kslideshow.kss size=0x28; file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20) -""" - DUMP_OUTPUT = ''' **** DYNAMIC SECTION INFORMATION **** .dynamic: @@ -337,85 +324,6 @@ self.assertEqual(fake_binary_elfinfo, ip.GetBinaryElfInfo()) - def testGetLddMinusRlinesRoot(self): - ip = inspective_package.InspectivePackage("/tmp/CSWfake") - self.mox.StubOutWithMock(ip, 'GetParsedPkginfo') - self.mox.StubOutWithMock(ip, 'GetFilesMetadata') - self.mox.StubOutWithMock(ip, 'GetBasedir') - self.mox.StubOutWithMock(ip, 'ListBinaries') - self.mox.StubOutWithMock(ip, 'GetFilesDir') - self.mox.StubOutWithMock(os, 'chmod') - self.mox.StubOutWithMock(os, 'uname') - ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'}) - ip.GetFilesMetadata().AndReturn([{ - 'path': 'opt/csw/bin/foo', - 'machine_id': 3, - 'mime_type': 'application/x-executable; charset=binary' - }]) - ip.GetBasedir().AndReturn('') - os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755) - ip.GetFilesDir().AndReturn('root') - self.mox.StubOutWithMock(shell, 'ShellCommand') - shell.ShellCommand( - ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], - allow_error=True, timeout=10).AndReturn((0, "", "")) - self.mox.StubOutWithMock(ip, '_ParseLddDashRline') - self.mox.ReplayAll() - self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) - - def testGetLddMinusRlinesReloc(self): - ip = inspective_package.InspectivePackage("/tmp/CSWfake") - self.mox.StubOutWithMock(ip, 'GetParsedPkginfo') - self.mox.StubOutWithMock(ip, 'GetFilesMetadata') - self.mox.StubOutWithMock(ip, 'GetBasedir') - self.mox.StubOutWithMock(ip, 'GetFilesDir') - self.mox.StubOutWithMock(os, 'chmod') - self.mox.StubOutWithMock(os, 'uname') - ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'}) - ip.GetFilesMetadata().AndReturn([{ - 'path': 'bin/foo', - 'machine_id': 3, - 'mime_type': 'application/x-executable; charset=binary' - }]) - ip.GetBasedir().AndReturn('opt/csw') - os.chmod('/tmp/CSWfake/reloc/bin/foo', 0755) - ip.GetFilesDir().AndReturn('reloc') - self.mox.StubOutWithMock(shell, 'ShellCommand') - shell.ShellCommand( - ['ldd', '-Ur', '/tmp/CSWfake/reloc/bin/foo'], - allow_error=True, timeout=10).AndReturn((0, "", "")) - self.mox.StubOutWithMock(ip, '_ParseLddDashRline') - self.mox.ReplayAll() - self.assertEqual({'opt/csw/bin/foo': []}, ip.GetLddMinusRlines()) - - def testGetLddMinusRlinesThrows(self): - ip = inspective_package.InspectivePackage("/tmp/CSWfake") - self.mox.StubOutWithMock(ip, 'GetParsedPkginfo') - self.mox.StubOutWithMock(ip, 'GetFilesMetadata') - self.mox.StubOutWithMock(ip, 'GetBasedir') - self.mox.StubOutWithMock(ip, 'GetFilesDir') - self.mox.StubOutWithMock(os, 'chmod') - self.mox.StubOutWithMock(os, 'uname') - ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'}) - ip.GetFilesMetadata().AndReturn([{ - 'path': 'opt/csw/bin/foo', - 'machine_id': 3, - 'mime_type': 'application/x-executable; charset=binary' - }]) - ip.GetBasedir().AndReturn('/') - os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755) - os.uname().AndReturn('i86pc') - ip.GetFilesDir().AndReturn('root') - self.mox.StubOutWithMock(shell, 'ShellCommand') - shell.ShellCommand( - ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'], - allow_error=True, timeout=10).AndReturn((1, "", "boo")) - self.mox.StubOutWithMock(ip, '_ParseLddDashRline') - self.mox.ReplayAll() - self.assertRaises(package.SystemUtilityError, - ip.GetLddMinusRlines) - - class PackageStatsUnitTest(unittest.TestCase): def setUp(self): @@ -476,65 +384,6 @@ line = 'foo' self.assertEqual(None, self.ip._ParseNmSymLine(line)) - def test_ParseLddSonameUnusued(self): - line = '\tunreferenced object=/lib/libsocket.so.1; unused dependency of /opt/csw/lib/libfoo.so.1' - expected = { - 'soname': 'libsocket.so.1', - 'state': 'soname-unused' - } - result = self.ip._ParseLddDashRline(line, '/opt/csw/lib/libfoo.so.1') - self.assertEqual(expected, result) - def test_ParseLddDashRlineFound(self): - line = '\tlibc.so.1 => /lib/libc.so.1' - expected = {} - self.assertEqual(expected,self.ip._ParseLddDashRline(line)) - - def test_ParseLddDashRlineSymbolMissing(self): - line = ('\tsymbol not found: check_encoding_conversion_args ' - '(/opt/csw/lib/postgresql/8.4/utf8_and_gbk.so)') - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLddDashRlineFound(self): - line = '\t/usr/lib/secure/s8_preload.so.1' - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLdd_VersionNotFound(self): - line = '\tlibXext.so.0 (SUNW_1.1) =>\t (version not found)' - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLdd_StvProtectedVisibility(self): - line = ('\trelocation R_SPARC_COPY symbol: ASN1_OCTET_STRING_it: ' - 'file /opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.8: ' - 'relocation bound to a symbol with STV_PROTECTED visibility') - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDiffer(self): - line = '\trelocation R_SPARC_COPY sizes differ: _ZTI7QWidget' - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDifferInfo(self): - line = ('\t\t(file /tmp/pkg_GqCk0P/CSWkdeartworkgcc/root/opt/csw/kde-gcc/bin/' - 'kslideshow.kss size=0x28; ' - 'file /opt/csw/kde-gcc/lib/libqt-mt.so.3 size=0x20)') - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLdd_SizesDifferOneUsed(self): - line = ('\t\t/opt/csw/kde-gcc/lib/libqt-mt.so.3 size used; ' - 'possible insufficient data copied') - expected = {} - self.assertEqual(expected, self.ip._ParseLddDashRline(line)) - - def test_ParseLddDashRlineManyLines(self): - for line in LDD_R_OUTPUT_1.splitlines(): - parsed = self.ip._ParseLddDashRline(line) - - if __name__ == '__main__': unittest.main() Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -665,7 +665,6 @@ }], 'depends': (('CSWlibfoo', None),), 'isalist': (), - 'ldd_info': { 'opt/csw/bin/bar': [] }, 'binaries_elf_info': { 'opt/csw/bin/bar': { 'version definition': [], 'version needed': [], @@ -693,7 +692,6 @@ 'binaries_dump_info': [], 'depends': [], 'isalist': (), - 'ldd_info': {}, 'pkgmap': [], } @@ -731,8 +729,7 @@ # 'depends': (), 'depends': ((u"CSWcommon", ""),), 'isalist': ('foo'), - 'ldd_info': { 'opt/csw/bin/bar': [], 'opt/csw/lib/libfoo.so.1': []}, - 'binaries_elf_info': { + 'binaries_elf_info': { 'opt/csw/bin/bar': { 'version definition': [], 'version needed': [], @@ -774,7 +771,6 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so' self.pkg_data["depends"] = ((u"CSWcommon", "This one provides directories"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] - self.pkg_data["ldd_info"] = { 'opt/csw/lib/python/site-packages/foo.so': [] } self.pkg_data["binaries_elf_info"] = { 'opt/csw/lib/python/site-packages/foo.so': { 'version definition': [], @@ -814,7 +810,6 @@ binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so' self.pkg_data["depends"] = ((u"CSWcommon","This is needed"),) self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1] - self.pkg_data["ldd_info"] = { 'opt/csw/lib/foo.so': [] } self.pkg_data["binaries_elf_info"] = { 'opt/csw/lib/foo.so': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -221,7 +221,6 @@ # or strings. We cannot store a datetime.datetime object, we must # convert it into a string. "mtime": self.GetMtime().isoformat(), - "ldd_info": dir_pkg.GetLddMinusRlines(), "binaries_elf_info": dir_pkg.GetBinaryElfInfo(), } self.SaveStats(pkg_stats) Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/package_stats_test.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -61,7 +61,6 @@ mock_dirpkg.GetFilesContaining(mox.IsA(tuple)).AndReturn([]) mock_dirpkg.GetFilesMetadata().AndReturn([]) mock_srv4.GetMtime().AndReturn(datetime.datetime(2010, 12, 8, 7, 52, 54)) - mock_dirpkg.GetLddMinusRlines().AndReturn({}) mock_dirpkg.GetBinaryElfInfo().AndReturn({}) pkgstats = package_stats.PackageStats(mock_srv4) self.mox.ReplayAll() Modified: csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/apr_util_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -206,11 +206,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so': [], - 'opt/csw/lib/apr-util-1/apr_dbd_sqlite3-1.so': [], - 'opt/csw/lib/apr-util-1/apr_dbm_db-1.so': [], - 'opt/csw/lib/apr-util-1/apr_ldap-1.so': [], - 'opt/csw/lib/libaprutil-1.so.0.3.9': []}, 'binaries_elf_info': {'opt/csw/lib/apr-util-1/apr_dbd_odbc-1.so': { 'version definition': [], 'version needed': [], Modified: csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/bdb48_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -744,68 +744,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/bdb48/bin/db_archive': [], - 'opt/csw/bdb48/bin/db_checkpoint': [], - 'opt/csw/bdb48/bin/db_deadlock': [], - 'opt/csw/bdb48/bin/db_dump': [], - 'opt/csw/bdb48/bin/db_hotbackup': [], - 'opt/csw/bdb48/bin/db_load': [], - 'opt/csw/bdb48/bin/db_printlog': [], - 'opt/csw/bdb48/bin/db_recover': [], - 'opt/csw/bdb48/bin/db_sql': [], - 'opt/csw/bdb48/bin/db_stat': [], - 'opt/csw/bdb48/bin/db_upgrade': [], - 'opt/csw/bdb48/bin/db_verify': [], - 'opt/csw/bdb48/bin/sparcv9/db_archive': [], - 'opt/csw/bdb48/bin/sparcv9/db_checkpoint': [], - 'opt/csw/bdb48/bin/sparcv9/db_deadlock': [], - 'opt/csw/bdb48/bin/sparcv9/db_dump': [], - 'opt/csw/bdb48/bin/sparcv9/db_hotbackup': [], - 'opt/csw/bdb48/bin/sparcv9/db_load': [], - 'opt/csw/bdb48/bin/sparcv9/db_printlog': [], - 'opt/csw/bdb48/bin/sparcv9/db_recover': [], - 'opt/csw/bdb48/bin/sparcv9/db_sql': [], - 'opt/csw/bdb48/bin/sparcv9/db_stat': [], - 'opt/csw/bdb48/bin/sparcv9/db_upgrade': [], - 'opt/csw/bdb48/bin/sparcv9/db_verify': [], - 'opt/csw/bdb48/lib/libdb-4.8.so': [], - 'opt/csw/bdb48/lib/libdb_cxx-4.8.so': [], - 'opt/csw/bdb48/lib/libdb_java-4.8.so': [], - 'opt/csw/bdb48/lib/libdb_tcl-4.8.so': [], - 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so': [], - 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so': [], - 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so': []}, - 'ldd_info': {'opt/csw/bdb48/bin/db_archive': {}, - 'opt/csw/bdb48/bin/db_checkpoint': {}, - 'opt/csw/bdb48/bin/db_deadlock': {}, - 'opt/csw/bdb48/bin/db_dump': {}, - 'opt/csw/bdb48/bin/db_hotbackup': {}, - 'opt/csw/bdb48/bin/db_load': {}, - 'opt/csw/bdb48/bin/db_printlog': {}, - 'opt/csw/bdb48/bin/db_recover': {}, - 'opt/csw/bdb48/bin/db_sql': {}, - 'opt/csw/bdb48/bin/db_stat': {}, - 'opt/csw/bdb48/bin/db_upgrade': {}, - 'opt/csw/bdb48/bin/db_verify': {}, - 'opt/csw/bdb48/bin/sparcv9/db_archive': {}, - 'opt/csw/bdb48/bin/sparcv9/db_checkpoint': {}, - 'opt/csw/bdb48/bin/sparcv9/db_deadlock': {}, - 'opt/csw/bdb48/bin/sparcv9/db_dump': {}, - 'opt/csw/bdb48/bin/sparcv9/db_hotbackup': {}, - 'opt/csw/bdb48/bin/sparcv9/db_load': {}, - 'opt/csw/bdb48/bin/sparcv9/db_printlog': {}, - 'opt/csw/bdb48/bin/sparcv9/db_recover': {}, - 'opt/csw/bdb48/bin/sparcv9/db_sql': {}, - 'opt/csw/bdb48/bin/sparcv9/db_stat': {}, - 'opt/csw/bdb48/bin/sparcv9/db_upgrade': {}, - 'opt/csw/bdb48/bin/sparcv9/db_verify': {}, - 'opt/csw/bdb48/lib/libdb-4.8.so': {}, - 'opt/csw/bdb48/lib/libdb_cxx-4.8.so': {}, - 'opt/csw/bdb48/lib/libdb_java-4.8.so': {}, - 'opt/csw/bdb48/lib/libdb_tcl-4.8.so': {}, - 'opt/csw/bdb48/lib/sparcv9/libdb-4.8.so': {}, - 'opt/csw/bdb48/lib/sparcv9/libdb_cxx-4.8.so': {}, - 'opt/csw/bdb48/lib/sparcv9/libdb_java-4.8.so': {}}, 'mtime': '2010-03-02T18:09:30', 'overrides': [], 'pkgchk': {'return_code': 0, Modified: csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/cadaver_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -148,38 +148,6 @@ 'pentium+mmx', 'pentium_pro', 'pentium_pro+mmx']), - 'ldd_info': {'opt/csw/bin/cadaver': [{'path': None, - 'soname': 'libcurses.so.1', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libnsl.so.1', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libsocket.so.1', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libz.so.1', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libssl.so.1.0.0', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libcrypto.so.1.0.0', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libdl.so.1', - 'state': 'soname-unused', - 'symbol': None}, - {'path': None, - 'soname': 'libexpat.so.1', - 'state': 'soname-unused', - 'symbol': None}]}, 'mtime': '2012-06-06T20:21:14', 'overrides': [], 'pkgmap': [{'class': None, Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -111,9 +111,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/lib/libdjvulibre.so.15': [], - 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0': [], - 'opt/csw/lib/libdjvulibre.so.21.1.0': [] }, 'binaries_elf_info': { 'opt/csw/lib/libdjvulibre.so.15': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -56,9 +56,7 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/bin/comdraw': [], - 'opt/csw/lib/libComUnidraw.so.1.1.3': []}, - 'binaries_elf_info': {'opt/csw/bin/comdraw': { + 'binaries_elf_info': {'opt/csw/bin/comdraw': { 'version definition': [], 'version needed' : [], 'symbol table': [ Modified: csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -85,7 +85,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0': []}, 'binaries_elf_info': { 'opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/libnet_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -30,7 +30,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {}, 'binaries_elf_info': {}, 'mtime': '2008-08-20T10:26:15', 'overrides': [], Modified: csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/mercurial_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -702,13 +702,6 @@ 'sparcv9', 'sparcv9+vis', 'sparcv9+vis2']), - 'ldd_info': { - 'opt/csw/lib/python/site-packages/mercurial/base85.so': [], - 'opt/csw/lib/python/site-packages/mercurial/bdiff.so': [], - 'opt/csw/lib/python/site-packages/mercurial/diffhelpers.so': [], - 'opt/csw/lib/python/site-packages/mercurial/mpatch.so': [], - 'opt/csw/lib/python/site-packages/mercurial/osutil.so': [], - 'opt/csw/lib/python/site-packages/mercurial/parsers.so': [],}, 'binaries_elf_info': { 'opt/csw/lib/python/site-packages/mercurial/base85.so': { 'version definition': [], 'version needed': [], Modified: csw/mgar/gar/v2/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -162,12 +162,6 @@ 'pentium+mmx', 'pentium_pro', 'pentium_pro+mmx']), - 'ldd_info': { - 'opt/csw/lib/libneon.so.26.0.4': [], - 'opt/csw/lib/libneon.so.27.2.0': [], - 'opt/csw/lib/sparcv9/libneon.so.26.0.4': [], - 'opt/csw/lib/sparcv9/libneon.so.27.2.0': [], - }, 'binaries_elf_info': { 'opt/csw/lib/libneon.so.26.0.4': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -74,10 +74,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': { - 'opt/csw/bin/sparcv8/rsync': [], - 'opt/csw/bin/sparcv9/rsync': [], - }, 'binaries_elf_info': { 'opt/csw/bin/sparcv8/rsync': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -70,10 +70,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': { - 'opt/csw/libexec/sudo_noexec.so': [], - 'opt/csw/sbin/visudo': [], - }, 'binaries_elf_info': {'opt/csw/libexec/sudo_noexec.so': { 'version needed': [], 'version definition': [], @@ -312,7 +308,6 @@ 'sparcv8-fsmuld', 'sparcv7', 'sparc'), - 'ldd_info': {'opt/csw/bin/sudo.minimal': []}, 'binaries_elf_info': { 'opt/csw/bin/sudo.minimal': { 'version definition': [], Modified: csw/mgar/gar/v2/lib/python/testdata/tree_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/tree_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -46,7 +46,6 @@ 'sparcv9', 'sparcv9+vis', 'sparcv9+vis2']), - 'ldd_info': {'opt/csw/bin/tree': [] }, 'binaries_elf_info': { 'opt/csw/bin/tree': { 'version definition': [], 'version needed': [], Modified: csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py 2013-06-13 16:13:47 UTC (rev 21333) +++ csw/mgar/gar/v2/lib/python/testdata/vsftpd_stats.py 2013-06-13 21:09:47 UTC (rev 21334) @@ -9768,78 +9768,6 @@ 'sparcv9', 'sparcv9+vis', 'sparcv9+vis2']), - 'ldd_info': {'opt/csw/sbin/vsftpd': [{'path': '/lib/libnsl.so.1', - 'soname': 'libnsl.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libpam.so.1', - 'soname': 'libpam.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libsocket.so.1', - 'soname': 'libsocket.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/librt.so.1', - 'soname': 'librt.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libsendfile.so.1', - 'soname': 'libsendfile.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/opt/csw/lib/sparcv8plus+vis/libssl.so.1.0.0', - 'soname': 'libssl.so.1.0.0', - 'state': 'OK', - 'symbol': None}, - {'path': '/opt/csw/lib/sparcv8plus+vis/libcrypto.so.1.0.0', - 'soname': 'libcrypto.so.1.0.0', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libc.so.1', - 'soname': 'libc.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libmp.so.2', - 'soname': 'libmp.so.2', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libmd.so.1', - 'soname': 'libmd.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libscf.so.1', - 'soname': 'libscf.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libcmd.so.1', - 'soname': 'libcmd.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libaio.so.1', - 'soname': 'libaio.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libdl.so.1', - 'soname': 'libdl.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libdoor.so.1', - 'soname': 'libdoor.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libuutil.so.1', - 'soname': 'libuutil.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libgen.so.1', - 'soname': 'libgen.so.1', - 'state': 'OK', - 'symbol': None}, - {'path': '/lib/libm.so.2', - 'soname': 'libm.so.2', - 'state': 'OK', - 'symbol': None}]}, 'mtime': datetime.datetime(2012, 8, 25, 12, 4, 51), 'obsoleteness_info': {'has_obsolete_info': False, 'obsoleted_by': [], 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 Jun 14 10:13:52 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 14 Jun 2013 08:13:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21335] csw/mgar/pkg/bass-cd/trunk/Makefile Message-ID: Revision: 21335 http://gar.svn.sourceforge.net/gar/?rev=21335&view=rev Author: lblume Date: 2013-06-14 08:13:47 +0000 (Fri, 14 Jun 2013) Log Message: ----------- bass-cd/trunk: Add dependency and license line Modified Paths: -------------- csw/mgar/pkg/bass-cd/trunk/Makefile Modified: csw/mgar/pkg/bass-cd/trunk/Makefile =================================================================== --- csw/mgar/pkg/bass-cd/trunk/Makefile 2013-06-13 21:09:47 UTC (rev 21334) +++ csw/mgar/pkg/bass-cd/trunk/Makefile 2013-06-14 08:13:47 UTC (rev 21335) @@ -21,14 +21,17 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -BUILD_DEP_PKGS += CSWscummvm +RUNTIME_DEP_PKGS_CSWbass-cd += CSWscummvm +CHECKPKG_OVERRIDES_CSWbass-cd += surplus-dependency|CSWscummvm +LICENSE = bass-cd-1.2/readme.txt + include gar/category.mk install-custom: @echo " ==> Installing $(NAME) (custom)" @echo worksrc: $(WORKSRC) @ginstall -m 755 -d $(DESTDIR)$(datadir)/scummvm/$(DISTNAME) - @ginstall -m 644 -p $(WORKSRC)/* $(DESTDIR)$(datadir)/scummvm/$(DISTNAME) + @ginstall -m 644 -p $(WORKSRC)/* $(DESTDIR)$(datadir)/scummvm/$(DISTNAME) @$(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 Fri Jun 14 10:16:11 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 14 Jun 2013 08:16:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21336] csw/mgar/pkg Message-ID: Revision: 21336 http://gar.svn.sourceforge.net/gar/?rev=21336&view=rev Author: lblume Date: 2013-06-14 08:16:11 +0000 (Fri, 14 Jun 2013) Log Message: ----------- lure/trunk: Add Lure of the Temptress Added Paths: ----------- csw/mgar/pkg/lure/ csw/mgar/pkg/lure/Makefile csw/mgar/pkg/lure/branches/ csw/mgar/pkg/lure/tags/ csw/mgar/pkg/lure/trunk/ csw/mgar/pkg/lure/trunk/Makefile csw/mgar/pkg/lure/trunk/checksums csw/mgar/pkg/lure/trunk/files/ Added: csw/mgar/pkg/lure/Makefile =================================================================== --- csw/mgar/pkg/lure/Makefile (rev 0) +++ csw/mgar/pkg/lure/Makefile 2013-06-14 08:16:11 UTC (rev 21336) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lure/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lure/trunk/Makefile =================================================================== --- csw/mgar/pkg/lure/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lure/trunk/Makefile 2013-06-14 08:16:11 UTC (rev 21336) @@ -0,0 +1,73 @@ +# $Id$ +# +NAME = lure +VERSION = 1.1 +GARTYPE = v2 + +DESCRIPTION = Lure of the Temptress, Freeware version +define BLURB + Trouble is afoot in the once peaceful land of Turnvale. Skori warriors (vicious mercenaries under the control of the mysterious Temptress) have arrived. But who is the Temptress, and more importantly, where is she? +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJECT = scummvm +DISTFILES = $(DISTNAME).zip +DISTFILES += $(NAME)-de-$(VERSION).zip +DISTFILES += $(NAME)-es-$(VERSION).zip +DISTFILES += $(NAME)-fr-$(VERSION).zip +DISTFILES += $(NAME)-it-$(VERSION).zip + +ARCHALL = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +PACKAGES = CSWlure +PACKAGES += CSWlure-de +PACKAGES += CSWlure-es +PACKAGES += CSWlure-fr +PACKAGES += CSWlure-it + +LICENSE = $(NAME)/LICENSE.txt + +WORKSRC = $(WORKDIR)/$(NAME) + +SPKG_DESC_CSWlure = Lure of the Temptress, Freeware version (English) +CATALOGNAME_CSWlure = lure +PKGFILES_CSWlure = $(datadir)/scummvm/$(NAME)[^-].* + +SPKG_DESC_CSWlure-de = Lure of the Temptress, Freeware version (German) +CATALOGNAME_CSWlure-de = lure_de +PKGFILES_CSWlure-de = $(datadir)/scummvm/$(NAME)-de.* + +SPKG_DESC_CSWlure-es = Lure of the Temptress, Freeware version (Spanish) +CATALOGNAME_CSWlure-es = lure_es +PKGFILES_CSWlure-es = $(datadir)/scummvm/$(NAME)-es.* + +SPKG_DESC_CSWlure-fr = Lure of the Temptress, Freeware version (French) +CATALOGNAME_CSWlure-fr = lure_fr +PKGFILES_CSWlure-fr = $(datadir)/scummvm/$(NAME)-fr.* + +SPKG_DESC_CSWlure-it = Lure of the Temptress, Freeware version (Italian) +CATALOGNAME_CSWlure-it = lure_it +PKGFILES_CSWlure-it = $(datadir)/scummvm/$(NAME)-it.* + +RUNTIME_DEP_PKGS += CSWscummvm +CHECKPKG_OVERRIDES += surplus-dependency|CSWscummvm + +# List of languages beside English +LANGUAGES = de es fr it + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(NAME) (custom)" + @echo worksrc: $(WORKSRC) + @ginstall -m 755 -d $(DESTDIR)$(datadir)/scummvm/$(NAME) + @ginstall -m 644 -p $(WORKSRC)/* $(DESTDIR)$(datadir)/scummvm/$(NAME) + @$(foreach lang, $(LANGUAGES), \ + ginstall -m 755 -d $(DESTDIR)$(datadir)/scummvm/$(NAME)-$(lang); ginstall -m 644 -p $(WORKSRC)-$(lang)/* $(DESTDIR)$(datadir)/scummvm/$(NAME)-$(lang); ) + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/lure/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lure/trunk/checksums =================================================================== --- csw/mgar/pkg/lure/trunk/checksums (rev 0) +++ csw/mgar/pkg/lure/trunk/checksums 2013-06-14 08:16:11 UTC (rev 21336) @@ -0,0 +1,5 @@ +d1300cef563bb4b6b1f88a2f1cee7832 lure-1.1.zip +202554fb0568eb01f740bfe82d8e725f lure-de-1.1.zip +317241ea2e9601686e2d1585c9b0c1a6 lure-es-1.1.zip +b178ae4520f7f9c7856911bc27fa2c5e lure-fr-1.1.zip +adcb47523294fdbbc0872ec6140b4722 lure-it-1.1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 14 15:39:00 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 14 Jun 2013 13:39:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[21337] csw/mgar/pkg/gstplugins/trunk Message-ID: Revision: 21337 http://gar.svn.sourceforge.net/gar/?rev=21337&view=rev Author: cgrzemba Date: 2013-06-14 13:38:58 +0000 (Fri, 14 Jun 2013) Log Message: ----------- gstplugins/trunk: update version 0.10.32 Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile csw/mgar/pkg/gstplugins/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gstplugins/trunk/files/0002-add-gtk-options.patch Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-14 08:16:11 UTC (rev 21336) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-14 13:38:58 UTC (rev 21337) @@ -1,5 +1,5 @@ NAME = gst-plugins-base -VERSION = 0.10.29 +VERSION = 0.10.32 CATEGORIES = gnome GARTYPE = v2 @@ -21,17 +21,40 @@ PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 GARCOMPILER = SOS12U3 -BUILD_DEP_PKGS += CSWpkgconfig CSWgstreamer-dev CSWliboildevel CSWlibglib2-dev -BUILD_DEP_PKGS += CSWgnomevfs2-dev CSWlibogg-dev CSWlibgtk2-dev CSWlibatk-dev -BUILD_DEP_PKGS += CSWlibgconf-dev CSWggettextrt CSWlibxml2-dev CSWlibz-dev +BUILD_DEP_PKGS += CSWpkgconfig +BUILD_DEP_PKGS += CSWgstreamer-dev +BUILD_DEP_PKGS += CSWliboildevel CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWgnomevfs2-dev +BUILD_DEP_PKGS += CSWlibogg-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWlibgconf-dev +BUILD_DEP_PKGS += CSWggettextrt +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibogg-dev BUILD_DEP_PKGS += CSWlibtheora-dev -BUILD_DEP_PKGS += CSWlibice CSWlibx11 CSWlibxvdevel CSWx11videoproto -BUILD_DEP_PKGS += CSWlibsm CSWlibxext -BUILD_DEP_PKGS += CSWlibvorbis-dev CSWpangodevel CSWlibpixman-dev -BUILD_DEP_PKGS += CSWfconfig-dev CSWlibpng-dev CSWx11xproto CSWx11renderproto -BUILD_DEP_PKGS += CSWlibx11devel CSWlibxcbdevel CSWlibxaudevel CSWlibxdmcpdevel +BUILD_DEP_PKGS += CSWlibice +BUILD_DEP_PKGS += CSWlibx11 +# BUILD_DEP_PKGS += CSWlibxvdevel +# BUILD_DEP_PKGS += CSWx11videoproto +BUILD_DEP_PKGS += CSWlibsm +# BUILD_DEP_PKGS += CSWlibxext +BUILD_DEP_PKGS += CSWlibvorbis-dev +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWx11xproto +# BUILD_DEP_PKGS += CSWx11renderproto +# BUILD_DEP_PKGS += CSWlibx11devel +# BUILD_DEP_PKGS += CSWlibxcbdevel +# BUILD_DEP_PKGS += CSWlibxaudevel +# BUILD_DEP_PKGS += CSWlibxdmcpdevel -PATCHFILES += 0001-Makefile.in.patch +# PATCHFILES += 0001-Makefile.in.patch +PATCHFILES += 0002-add-gtk-options.patch REINPLACE_USRSHARE += docs/plugins/html/*.html docs/libs/html/*.html PACKAGES = CSWgstplugins @@ -259,6 +282,7 @@ RUNTIME_DEP_PKGS_CSWgstplugins-dev += CSWlibgstaudio0-10-0 CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --disable-alsa CONFIGURE_ARGS += --disable-cdparanoia @@ -282,6 +306,11 @@ # I want see whats going on AM_DEFAULT_VERBOSITY:=1 +# force rebuild of configure, patch 0002-add-gtk-options changes configure.ac +pre-configure: + cd $(WORKSRC) && autoconf --force + $(MAKECOOKIE) + # sigh, portable code? # post-configure-modulated: # gsed -i 's/\(LIBS = -lnsl -lsocket\)/\1 -lresolv/' \ Modified: csw/mgar/pkg/gstplugins/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins/trunk/checksums 2013-06-14 08:16:11 UTC (rev 21336) +++ csw/mgar/pkg/gstplugins/trunk/checksums 2013-06-14 13:38:58 UTC (rev 21337) @@ -1 +1 @@ -15da191eaea60f08f6955ce89bc0d211 gst-plugins-base-0.10.29.tar.gz +ddfd2d71cfa594529dfa7a8e0fb37b79 gst-plugins-base-0.10.32.tar.gz Added: csw/mgar/pkg/gstplugins/trunk/files/0002-add-gtk-options.patch =================================================================== --- csw/mgar/pkg/gstplugins/trunk/files/0002-add-gtk-options.patch (rev 0) +++ csw/mgar/pkg/gstplugins/trunk/files/0002-add-gtk-options.patch 2013-06-14 13:38:58 UTC (rev 21337) @@ -0,0 +1,41 @@ +From ab7c5cd78d360d3b3a2fed8ae50b4a9aed623339 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Fri, 14 Jun 2013 12:16:33 +0200 +Subject: [PATCH] add gtk options + +--- + configure.ac | 2 ++ + 1 files changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 3325abc..35b7a0e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -297,7 +297,9 @@ if test "x$BUILD_EXAMPLES" = "xyes"; then + PKG_CHECK_MODULES(GTK, gtk+-$with_gtk >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no) + dnl some examples need gtk+-x11 + PKG_CHECK_MODULES(GTK_X11, gtk+-x11-$with_gtk >= $GTK_REQ, HAVE_GTK_X11=yes, HAVE_GTK_X11=no) ++ GTK_LIBS="`$PKG_CONFIG --libs gtk+-$with_gtk`" + AC_SUBST(GTK_LIBS) ++ GTK_CFLAGS="`$PKG_CONFIG --cflags gtk+-$with_gtk`" + AC_SUBST(GTK_CFLAGS) + fi + AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") +--- a/configure.ac ++++ b/configure.ac +@@ -782,6 +782,11 @@ dnl *** theora *** + translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true) + AG_GST_CHECK_FEATURE(THEORA, [Xiph Theora video codec], theora, [ + AG_GST_PKG_CHECK_MODULES(THEORA, theoradec >= 1.1 theoraenc >= 1.1) ++ if test $HAVE_THEORA = yes ++ then ++ THEORA_LIBS="`$PKG_CONFIG --libs theora`" ++ AC_SUBST(THEORA_LIBS) ++ fi + ]) + + dnl *** vorbis *** + +-- +1.7.12 + 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 Jun 14 22:41:54 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 14 Jun 2013 20:41:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21338] csw/mgar/gar/v2/lib/python/shell.py Message-ID: Revision: 21338 http://gar.svn.sourceforge.net/gar/?rev=21338&view=rev Author: chninkel Date: 2013-06-14 20:41:52 +0000 (Fri, 14 Jun 2013) Log Message: ----------- gar/v2: checkpkg: shell commands are executed with LC_ALL=C Modified Paths: -------------- csw/mgar/gar/v2/lib/python/shell.py Modified: csw/mgar/gar/v2/lib/python/shell.py =================================================================== --- csw/mgar/gar/v2/lib/python/shell.py 2013-06-14 13:38:58 UTC (rev 21337) +++ csw/mgar/gar/v2/lib/python/shell.py 2013-06-14 20:41:52 UTC (rev 21338) @@ -15,7 +15,7 @@ def TimeoutHandler(signum, frame): raise TimeoutExpired -def ShellCommand(args, env=None, timeout=None, +def ShellCommand(args, env={}, timeout=None, quiet=True, allow_error=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE): @@ -25,6 +25,8 @@ stdout = subprocess.STDOUT stderr = subprocess.STDOUT + env['LC_ALL'] = 'C' + # Python 3.3 have the timeout option # we have to roughly emulate it with python 2.x if timeout: 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 Jun 14 22:43:47 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 14 Jun 2013 20:43:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21339] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 21339 http://gar.svn.sourceforge.net/gar/?rev=21339&view=rev Author: chninkel Date: 2013-06-14 20:43:47 +0000 (Fri, 14 Jun 2013) Log Message: ----------- openssh/trunk: updated to 6.2p2 Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/Makefile csw/mgar/pkg/openssh/trunk/checksums Modified: csw/mgar/pkg/openssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssh/trunk/Makefile 2013-06-14 20:41:52 UTC (rev 21338) +++ csw/mgar/pkg/openssh/trunk/Makefile 2013-06-14 20:43:47 UTC (rev 21339) @@ -12,7 +12,7 @@ ###### Package information ####### NAME = openssh -VERSION = 6.2p1 +VERSION = 6.2p2 GSSKEX_PATCH_VERSION = 6.2p1 GSSKEX_PATCH_DATE = 20130502 GARTYPE = v2 Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2013-06-14 20:41:52 UTC (rev 21338) +++ csw/mgar/pkg/openssh/trunk/checksums 2013-06-14 20:43:47 UTC (rev 21339) @@ -1 +1 @@ -7b2d9dd75b5cf267ea1737ec75500316 openssh-6.2p1.tar.gz +be46174dcbb77ebb4ea88ef140685de1 openssh-6.2p2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jun 14 23:04:42 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 14 Jun 2013 21:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21340] csw/mgar/pkg/gnutls3/trunk Message-ID: Revision: 21340 http://gar.svn.sourceforge.net/gar/?rev=21340&view=rev Author: chninkel Date: 2013-06-14 21:04:38 +0000 (Fri, 14 Jun 2013) Log Message: ----------- gnutls3/trunk: updated to 3.1.12 Modified Paths: -------------- csw/mgar/pkg/gnutls3/trunk/Makefile csw/mgar/pkg/gnutls3/trunk/checksums Modified: csw/mgar/pkg/gnutls3/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-14 20:43:47 UTC (rev 21339) +++ csw/mgar/pkg/gnutls3/trunk/Makefile 2013-06-14 21:04:38 UTC (rev 21340) @@ -1,5 +1,5 @@ NAME = gnutls -VERSION = 3.1.10 +VERSION = 3.1.12 DESCRIPTION = GNU Transport Layer Security libraries and tools define BLURB Modified: csw/mgar/pkg/gnutls3/trunk/checksums =================================================================== --- csw/mgar/pkg/gnutls3/trunk/checksums 2013-06-14 20:43:47 UTC (rev 21339) +++ csw/mgar/pkg/gnutls3/trunk/checksums 2013-06-14 21:04:38 UTC (rev 21340) @@ -1 +1 @@ -9e73aa5c3ef3b7358159a31302e25aa7 gnutls-3.1.10.tar.xz +818cfc4cc2a1631c0256a809bd8c5e7e gnutls-3.1.12.tar.xz 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 Jun 14 23:22:17 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 14 Jun 2013 21:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[21341] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 21341 http://gar.svn.sourceforge.net/gar/?rev=21341&view=rev Author: chninkel Date: 2013-06-14 21:22:17 +0000 (Fri, 14 Jun 2013) Log Message: ----------- lftp/trunk: updated to 4.4.8 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-06-14 21:04:38 UTC (rev 21340) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-06-14 21:22:17 UTC (rev 21341) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = lftp -VERSION = 4.4.4 +VERSION = 4.4.8 GARTYPE = v2 DESCRIPTION = A sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2013-06-14 21:04:38 UTC (rev 21340) +++ csw/mgar/pkg/lftp/trunk/checksums 2013-06-14 21:22:17 UTC (rev 21341) @@ -1 +1 @@ -fb3e4fd15b43c0a30e5b68079d9919dc lftp-4.4.4.tar.gz +30b58bd1d7f73ed51ee9778497f4fb1f lftp-4.4.8.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 Sat Jun 15 07:55:23 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 15 Jun 2013 05:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21342] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21342 http://gar.svn.sourceforge.net/gar/?rev=21342&view=rev Author: slowfranklin Date: 2013-06-15 05:55:18 +0000 (Sat, 15 Jun 2013) Log Message: ----------- tracker/trunk: Fix dependencies Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-14 21:22:17 UTC (rev 21341) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-15 05:55:18 UTC (rev 21342) @@ -82,7 +82,7 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWpoppler +RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpoppler-glib8 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWexempi RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibflac 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 Jun 15 13:18:42 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 15 Jun 2013 11:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21343] csw/mgar/pkg/smartmontools/trunk Message-ID: Revision: 21343 http://gar.svn.sourceforge.net/gar/?rev=21343&view=rev Author: lblume Date: 2013-06-15 11:18:37 +0000 (Sat, 15 Jun 2013) Log Message: ----------- smartmontools/trunk: Bump version to 6.1 Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile csw/mgar/pkg/smartmontools/trunk/checksums Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2013-06-15 05:55:18 UTC (rev 21342) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2013-06-15 11:18:37 UTC (rev 21343) @@ -1,7 +1,7 @@ # $Id$ NAME = smartmontools -VERSION = 5.42 +VERSION = 6.1 GARTYPE = v2 DESCRIPTION = S.M.A.R.T. disk monitoring tools Modified: csw/mgar/pkg/smartmontools/trunk/checksums =================================================================== --- csw/mgar/pkg/smartmontools/trunk/checksums 2013-06-15 05:55:18 UTC (rev 21342) +++ csw/mgar/pkg/smartmontools/trunk/checksums 2013-06-15 11:18:37 UTC (rev 21343) @@ -1 +1 @@ -4460bf9a79a1252ff5c00ba52cf76b2a smartmontools-5.42.tar.gz +83a3a681f8183ed858392d550ae1cca6 smartmontools-6.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 15 14:13:26 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 Jun 2013 12:13:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21344] csw/mgar/pkg/git/trunk Message-ID: Revision: 21344 http://gar.svn.sourceforge.net/gar/?rev=21344&view=rev Author: bdwalton Date: 2013-06-15 12:13:24 +0000 (Sat, 15 Jun 2013) Log Message: ----------- version bump; drop merged patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-06-15 11:18:37 UTC (rev 21343) +++ csw/mgar/pkg/git/trunk/Makefile 2013-06-15 12:13:24 UTC (rev 21344) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.8.2.1 +VERSION = 1.8.3.1 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 @@ -117,7 +117,6 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch -PATCHFILES += 0006-Fix-use-of-non-portable-strftime-format-string.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2013-06-15 11:18:37 UTC (rev 21343) +++ csw/mgar/pkg/git/trunk/checksums 2013-06-15 12:13:24 UTC (rev 21344) @@ -1 +1 @@ -3f6ebca116c627490e4ee1f1324d5e65 git-1.8.2.1.tar.gz +35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz Deleted: csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch 2013-06-15 11:18:37 UTC (rev 21343) +++ csw/mgar/pkg/git/trunk/files/0006-Fix-use-of-non-portable-strftime-format-string.patch 2013-06-15 12:13:24 UTC (rev 21344) @@ -1,29 +0,0 @@ -From 4e13b01e8678d73f4bc68189ea278eef6b38fd4d Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Fri, 22 Feb 2013 00:22:15 +0100 -Subject: [PATCH] Fix use of non-portable strftime format string. - -This is merged in a more proper manner upstream, but until that lands -in a release, this quick hack should work for us. - -Signed-off-by: Ben Walton ---- - git-cvsimport.perl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/git-cvsimport.perl b/git-cvsimport.perl -index 0a31ebd..dda0966 100755 ---- a/git-cvsimport.perl -+++ b/git-cvsimport.perl -@@ -864,7 +864,7 @@ sub commit { - } - - set_timezone($author_tz); -- my $commit_date = strftime("%s %z", localtime($date)); -+ my $commit_date = strftime("$date %z", localtime($date)); - set_timezone('UTC'); - $ENV{GIT_AUTHOR_NAME} = $author_name; - $ENV{GIT_AUTHOR_EMAIL} = $author_email; --- -1.8.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From slowfranklin at users.sourceforge.net Sat Jun 15 18:33:21 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Sat, 15 Jun 2013 16:33:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21345] csw/mgar/pkg/tracker/trunk Message-ID: Revision: 21345 http://gar.svn.sourceforge.net/gar/?rev=21345&view=rev Author: slowfranklin Date: 2013-06-15 16:33:15 +0000 (Sat, 15 Jun 2013) Log Message: ----------- tracker/trunk: Fix deps and patch for stdbool include Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tracker/trunk/files/0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-15 12:13:24 UTC (rev 21344) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-15 16:33:15 UTC (rev 21345) @@ -41,8 +41,6 @@ BUILD_DEP_PKGS += CSWlibiptcdata BUILD_DEP_PKGS += CSWpoppler-dev BUILD_DEP_PKGS += CSWexempidevel -BUILD_DEP_PKGS += CSWlibvorbis-dev -BUILD_DEP_PKGS += CSWlibflac-dev BUILD_DEP_PKGS += CSWgstreamer BUILD_DEP_PKGS += CSWlibexif-dev @@ -54,7 +52,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-dev +RUNTIME_DEP_PKGS_CSWtracker += CSWexempi RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 @@ -84,8 +82,6 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpoppler-glib8 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWexempi -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibflac RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWgstreamer RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-common @@ -117,13 +113,13 @@ PATCHFILES += 0002-strnlen-replacement-function.patch PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch +PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch # Packages PACKAGES += CSWtracker SPKG_DESC_CSWtracker = $(DESCRIPTION) CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdbus CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWdconf -CHECKPKG_OVERRIDES_CSWtracker += surplus-dependency|CSWlibglib2-dev PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common Added: csw/mgar/pkg/tracker/trunk/files/0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch =================================================================== --- csw/mgar/pkg/tracker/trunk/files/0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch (rev 0) +++ csw/mgar/pkg/tracker/trunk/files/0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch 2013-06-15 16:33:15 UTC (rev 21345) @@ -0,0 +1,37 @@ +From 71b1e4f90d396a963eabb2209daa2621ba5524b6 Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Sat, 15 Jun 2013 15:59:04 +0200 +Subject: [PATCH] exempi xmp.h is missing a stdbool.h include + +--- + src/libtracker-extract/tracker-xmp.c | 1 + + src/tracker-writeback/tracker-writeback-xmp.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c +index 8729af0..1c57b2d 100644 +--- a/src/libtracker-extract/tracker-xmp.c ++++ b/src/libtracker-extract/tracker-xmp.c +@@ -20,6 +20,7 @@ + #include "config.h" + + #include ++#include + + #include + +diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c +index 73b0df0..b8ddad7 100644 +--- a/src/tracker-writeback/tracker-writeback-xmp.c ++++ b/src/tracker-writeback/tracker-writeback-xmp.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + #include +-- +1.8.1.4 + 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 Jun 16 01:00:23 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 15 Jun 2013 23:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21346] csw/mgar/pkg/git/trunk Message-ID: Revision: 21346 http://gar.svn.sourceforge.net/gar/?rev=21346&view=rev Author: bdwalton Date: 2013-06-15 23:00:18 +0000 (Sat, 15 Jun 2013) Log Message: ----------- git/trunk: add a patch to work around broken tr Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-06-15 16:33:15 UTC (rev 21345) +++ csw/mgar/pkg/git/trunk/Makefile 2013-06-15 23:00:18 UTC (rev 21346) @@ -117,6 +117,7 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch +PATCHFILES += 0007-t0008-ignores-Work-around-broken-solaris-tr.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-t0008-ignores-Work-around-broken-solaris-tr.patch 2013-06-15 23:00:18 UTC (rev 21346) @@ -0,0 +1,39 @@ +From 4e0185d4697173873aa407ae318fa484e2f206ac Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 16 Jun 2013 00:53:50 +0200 +Subject: [PATCH] t0008-ignores: Work around broken solaris tr + +The tr provided by solaris (both /usr/bin/ and /usr/xpg4/bin) fails +to handle the \0 as the substitution. Replace tr with an +equivalent perl invocation. + +Signed-off-by: Ben Walton +--- + t/t0008-ignores.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh +index 9c1bde1..bd6817b 100755 +--- a/t/t0008-ignores.sh ++++ b/t/t0008-ignores.sh +@@ -522,7 +522,7 @@ sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ + sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ + tr "\n" "\0" >expected-default0 + sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ +- tr ":\t\n" "\0" >expected-verbose0 ++ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 + + test_expect_success '--stdin' ' + expect_from_stdin expected-default0 + sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ +- tr ":\t\n" "\0" >expected-verbose0 ++ perl -pne 's/[:\t\n]/\0/g' >expected-verbose0 + + test_expect_success '--stdin from subdirectory' ' + expect_from_stdin Revision: 21347 http://gar.svn.sourceforge.net/gar/?rev=21347&view=rev Author: lblume Date: 2013-06-16 13:12:18 +0000 (Sun, 16 Jun 2013) Log Message: ----------- wxwidgets/trunk: Add explicit -lCrun -lCstd; keep -mt in wx-config Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-15 23:00:18 UTC (rev 21346) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-16 13:12:18 UTC (rev 21347) @@ -107,7 +107,7 @@ EXTRA_CFLAGS += -xnorunpath EXTRA_CXXFLAGS += -norunpath EXTRA_LDFLAGS += -norunpath -EXTRA_LD_OPTIONS += -z nolazyload -B direct +EXTRA_LD_OPTIONS += -z nolazyload -B direct -lCrun -lCstd # wxWidget contains a bunch of .so, let's keep them together as one big # happy family @@ -133,6 +133,5 @@ -e '/^[^#]/s/-norunpath[^ ]* //' \ -e '/^[^#]/s/-lCrun[^ ]* //' \ -e '/^[^#]/s/-lCstd[^ ]* //' \ - -e '/^[^#]/s/-mt[^ ]* //' \ $(DESTDIR)$(libdir)/wx/config/gtk2-unicode-release-2.8 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 Jun 16 21:29:50 2013 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 16 Jun 2013 19:29:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21348] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 21348 http://gar.svn.sourceforge.net/gar/?rev=21348&view=rev Author: chninkel Date: 2013-06-16 19:29:44 +0000 (Sun, 16 Jun 2013) Log Message: ----------- lftp/trunk: add libz1 dependency and update changelog Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2013-06-16 13:12:18 UTC (rev 21347) +++ csw/mgar/pkg/lftp/trunk/Makefile 2013-06-16 19:29:44 UTC (rev 21348) @@ -29,6 +29,7 @@ RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibreadline6 +RUNTIME_DEP_PKGS += CSWlibz1 # necessary when compiled with gcc RUNTIME_DEP_PKGS += CSWlibgcc-s1 RUNTIME_DEP_PKGS += CSWlibstdc++6 Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-06-16 13:12:18 UTC (rev 21347) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2013-06-16 19:29:44 UTC (rev 21348) @@ -1,3 +1,10 @@ +lftp (4.4.8,REV=2013.06.16) unstable + + * New upstream release. + * Added CSWlibz1 dependency as lftp now support http gzip encoding. + + -- Yann Rouillard Sun, 16 Jun 2013 21:28:43 +0200 + lftp (4.4.4,REV=2013.03.13) unstable * New upstream release. 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 Jun 16 21:45:57 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 16 Jun 2013 19:45:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[21349] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 21349 http://gar.svn.sourceforge.net/gar/?rev=21349&view=rev Author: bdwalton Date: 2013-06-16 19:45:57 +0000 (Sun, 16 Jun 2013) Log Message: ----------- git/trunk: update the emacs dependency Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2013-06-16 19:29:44 UTC (rev 21348) +++ csw/mgar/pkg/git/trunk/Makefile 2013-06-16 19:45:57 UTC (rev 21349) @@ -76,7 +76,7 @@ RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps -RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacscommon +RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacs-common RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit 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 Jun 17 10:21:59 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Jun 2013 08:21:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[21350] csw/mgar/pkg/xchm/trunk Message-ID: Revision: 21350 http://gar.svn.sourceforge.net/gar/?rev=21350&view=rev Author: dmichelsen Date: 2013-06-17 08:21:45 +0000 (Mon, 17 Jun 2013) Log Message: ----------- xchm/trunk: Update to 1.20 Modified Paths: -------------- csw/mgar/pkg/xchm/trunk/Makefile csw/mgar/pkg/xchm/trunk/checksums Modified: csw/mgar/pkg/xchm/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchm/trunk/Makefile 2013-06-16 19:45:57 UTC (rev 21349) +++ csw/mgar/pkg/xchm/trunk/Makefile 2013-06-17 08:21:45 UTC (rev 21350) @@ -1,5 +1,5 @@ NAME = xchm -VERSION = 1.18 +VERSION = 1.20 GARTYPE = v2 DESCRIPTION = Cross-platform GUI front-end to chmlib (.chm reader) @@ -13,19 +13,20 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = 0001-Fix-extra-comma-at-end-of-enum.patch PATCHFILES += 0002-Remove-W-Wall-for-Sun-Studio.patch -PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch +#PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWwxwidgets-dev +BUILD_DEP_PKGS += CSWlibncurses-dev + RUNTIME_DEP_PKGS_CSWxchm = CSWchmlib RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetscommon RUNTIME_DEP_PKGS_CSWxchm += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWxchm += CSWsunmath RUNTIME_DEP_PKGS_CSWxchm += CSWncurses -BUILD_DEP_PKGS = $(REQUIRED_PGKS) CSWwxwidgetsdevel - CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/xchm/trunk/checksums =================================================================== --- csw/mgar/pkg/xchm/trunk/checksums 2013-06-16 19:45:57 UTC (rev 21349) +++ csw/mgar/pkg/xchm/trunk/checksums 2013-06-17 08:21:45 UTC (rev 21350) @@ -1 +1 @@ -07d7a910b3216301a002be5630c71866 xchm-1.18.tar.gz +85943645d20af536704a20b58ebd5849 xchm-1.20.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 Jun 17 11:15:37 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Jun 2013 09:15:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21351] csw/mgar/pkg/chmlib/trunk Message-ID: Revision: 21351 http://gar.svn.sourceforge.net/gar/?rev=21351&view=rev Author: dmichelsen Date: 2013-06-17 09:15:33 +0000 (Mon, 17 Jun 2013) Log Message: ----------- chmlib/trunk: Update to Solaris 10, latest standards and new package naming Modified Paths: -------------- csw/mgar/pkg/chmlib/trunk/Makefile csw/mgar/pkg/chmlib/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch csw/mgar/pkg/chmlib/trunk/files/0002-integrate-gnulib-into-the-auto-tool-files.patch csw/mgar/pkg/chmlib/trunk/files/0003-add-dummy-config.h-file.patch csw/mgar/pkg/chmlib/trunk/files/0004-add-autoconf-checks-for-lnsl-and-lsocket.patch Modified: csw/mgar/pkg/chmlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/chmlib/trunk/Makefile 2013-06-17 08:21:45 UTC (rev 21350) +++ csw/mgar/pkg/chmlib/trunk/Makefile 2013-06-17 09:15:33 UTC (rev 21351) @@ -12,17 +12,25 @@ endef MASTER_SITES = http://www.jedrea.com/chmlib/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 -PATCHFILES = 0001-gnulib-import-getopt-posix.patch -PATCHFILES += 0002-integrate-gnulib-into-the-auto-tool-files.patch -PATCHFILES += 0003-add-dummy-config.h-file.patch -PATCHFILES += 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 -BUILD64_LIBS_ONLY = 1 +PACKAGES += CSWlibchm0 +SPKG_DESC_CSWlibchm0 = Library designed for accessing MS ITSS files (chm), libchm.so.0 +PKGFILES_CSWlibchm0 += $(call pkgfiles_lib,libchm.so.0) +OBSOLETED_BY_CSWlibchm0 += CSWchmlib + +PACKAGES += CSWlibchm-dev +SPKG_DESC_CSWlibchm-dev = Development files for libchm.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibchm-dev += CSWlibchm0 + +EXTRA_LINKER_FLAGS += -lnsl -lsocket + +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-examples @@ -31,11 +39,7 @@ include gar/category.mk -pre-configure-modulated: - @(cd $(WORKSRC); aclocal -I gnulib/m4; autoconf -I gnulib/m4; automake) - @$(MAKECOOKIE) - -post-install-modulated: +post-install: ginstall -d $(DESTDIR)$(docdir)/$(NAME) $(foreach D,$(DOCS),ginstall $(WORKSRC)/$D $(DESTDIR)$(docdir)/$(NAME)/$D;) @$(MAKECOOKIE) Modified: csw/mgar/pkg/chmlib/trunk/checksums =================================================================== --- csw/mgar/pkg/chmlib/trunk/checksums 2013-06-17 08:21:45 UTC (rev 21350) +++ csw/mgar/pkg/chmlib/trunk/checksums 2013-06-17 09:15:33 UTC (rev 21351) @@ -1,5 +1 @@ -b454cb00abe8653f2e3c11318a884e0e 0001-gnulib-import-getopt-posix.patch -c181447a053d0c5a83099af4a68a5510 0002-integrate-gnulib-into-the-auto-tool-files.patch -b96303db2702dd6696ea45dfba2de5dc 0003-add-dummy-config.h-file.patch -883567051286cd6984b7a1b23fa8e783 0004-add-autoconf-checks-for-lnsl-and-lsocket.patch 7ea49ed8c335215c1edc6fae83e6b912 chmlib-0.40.tar.bz2 Deleted: csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch =================================================================== --- csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch 2013-06-17 08:21:45 UTC (rev 21350) +++ csw/mgar/pkg/chmlib/trunk/files/0001-gnulib-import-getopt-posix.patch 2013-06-17 09:15:33 UTC (rev 21351) @@ -1,4596 +0,0 @@ -From 23637dad0fc9fb0e5e0755744d5d3726536068ee Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Thu, 15 Oct 2009 21:32:41 +0200 -Subject: [PATCH 1/4] gnulib --import getopt-posix - ---- - gnulib/Makefile.am | 207 ++++++++ - gnulib/dummy.c | 42 ++ - gnulib/getopt.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++ - gnulib/getopt.in.h | 242 +++++++++ - gnulib/getopt1.c | 170 +++++++ - gnulib/getopt_int.h | 130 +++++ - gnulib/gettext.h | 279 +++++++++++ - gnulib/m4/00gnulib.m4 | 30 ++ - gnulib/m4/extensions.m4 | 104 ++++ - gnulib/m4/getopt.m4 | 250 ++++++++++ - gnulib/m4/gnulib-cache.m4 | 36 ++ - gnulib/m4/gnulib-common.m4 | 124 +++++ - gnulib/m4/gnulib-comp.m4 | 197 ++++++++ - gnulib/m4/gnulib-tool.m4 | 57 +++ - gnulib/m4/include_next.m4 | 187 +++++++ - gnulib/m4/onceonly.m4 | 90 ++++ - gnulib/m4/stddef_h.m4 | 45 ++ - gnulib/m4/unistd_h.m4 | 115 +++++ - gnulib/m4/wchar_t.m4 | 20 + - gnulib/stddef.in.h | 86 ++++ - gnulib/unistd.in.h | 784 +++++++++++++++++++++++++++++ - link-warning.h | 28 + - 22 files changed, 4409 insertions(+), 0 deletions(-) - create mode 100644 gnulib/Makefile.am - create mode 100644 gnulib/dummy.c - create mode 100644 gnulib/getopt.c - create mode 100644 gnulib/getopt.in.h - create mode 100644 gnulib/getopt1.c - create mode 100644 gnulib/getopt_int.h - create mode 100644 gnulib/gettext.h - create mode 100644 gnulib/m4/00gnulib.m4 - create mode 100644 gnulib/m4/extensions.m4 - create mode 100644 gnulib/m4/getopt.m4 - create mode 100644 gnulib/m4/gnulib-cache.m4 - create mode 100644 gnulib/m4/gnulib-common.m4 - create mode 100644 gnulib/m4/gnulib-comp.m4 - create mode 100644 gnulib/m4/gnulib-tool.m4 - create mode 100644 gnulib/m4/include_next.m4 - create mode 100644 gnulib/m4/onceonly.m4 - create mode 100644 gnulib/m4/stddef_h.m4 - create mode 100644 gnulib/m4/unistd_h.m4 - create mode 100644 gnulib/m4/wchar_t.m4 - create mode 100644 gnulib/stddef.in.h - create mode 100644 gnulib/unistd.in.h - create mode 100644 link-warning.h - -diff --git a/gnulib/Makefile.am b/gnulib/Makefile.am -new file mode 100644 -index 0000000..ddcdb88 ---- /dev/null -+++ b/gnulib/Makefile.am -@@ -0,0 +1,207 @@ -+## DO NOT EDIT! GENERATED AUTOMATICALLY! -+## Process this file with automake to produce Makefile.in. -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu -+ -+AUTOMAKE_OPTIONS = 1.5 gnits -+ -+SUBDIRS = -+noinst_HEADERS = -+noinst_LIBRARIES = -+noinst_LTLIBRARIES = -+EXTRA_DIST = -+BUILT_SOURCES = -+SUFFIXES = -+MOSTLYCLEANFILES = core *.stackdump -+MOSTLYCLEANDIRS = -+CLEANFILES = -+DISTCLEANFILES = -+MAINTAINERCLEANFILES = -+EXTRA_DIST += m4/gnulib-cache.m4 -+ -+AM_CPPFLAGS = -+AM_CFLAGS = -+ -+noinst_LTLIBRARIES += libgnu.la -+ -+libgnu_la_SOURCES = -+libgnu_la_LIBADD = $(gl_LTLIBOBJS) -+libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) -+EXTRA_libgnu_la_SOURCES = -+libgnu_la_LDFLAGS = $(AM_LDFLAGS) -+ -+## begin gnulib module getopt-posix -+ -+BUILT_SOURCES += $(GETOPT_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+getopt.h: getopt.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/getopt.in.h; \ -+ } > $@-t && \ -+ mv -f $@-t $@ -+MOSTLYCLEANFILES += getopt.h getopt.h-t -+ -+## end gnulib module getopt-posix -+ -+## begin gnulib module gettext-h -+ -+libgnu_la_SOURCES += gettext.h -+ -+## end gnulib module gettext-h -+ -+## begin gnulib module link-warning -+ -+LINK_WARNING_H=$(top_srcdir)/./link-warning.h -+ -+## end gnulib module link-warning -+ -+## begin gnulib module stddef -+ -+BUILT_SOURCES += $(STDDEF_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that works with the given compiler. -+stddef.h: stddef.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -+ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -+ < $(srcdir)/stddef.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += stddef.h stddef.h-t -+ -+## end gnulib module stddef -+ -+## begin gnulib module unistd -+ -+BUILT_SOURCES += unistd.h -+ -+# We need the following in order to create an empty placeholder for -+# when the system doesn't have one. -+unistd.h: unistd.in.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -+ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -+ -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -+ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -+ -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \ -+ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ -+ -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -+ -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \ -+ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ -+ -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \ -+ -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -+ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -+ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ -+ -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ -+ -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ -+ -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -+ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -+ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -+ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -+ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -+ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -+ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -+ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -+ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -+ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -+ -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \ -+ -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \ -+ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ -+ -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \ -+ -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \ -+ -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \ -+ -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \ -+ -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -+ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ -+ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ -+ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ -+ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ -+ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -+ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -+ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ -+ -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -+ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -+ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -+ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -+ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -+ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ -+ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -+ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -+ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ -+ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -+ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -+ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -+ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -+ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -+ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -+ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -+ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -+ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -+ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -+ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -+ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -+ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -+ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -+ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -+ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -+ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ -+ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ -+ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -+ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -+ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ -+ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ -+ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ -+ < $(srcdir)/unistd.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += unistd.h unistd.h-t -+ -+## end gnulib module unistd -+ -+## begin gnulib module dummy -+ -+libgnu_la_SOURCES += dummy.c -+ -+## end gnulib module dummy -+ -+ -+mostlyclean-local: mostlyclean-generic -+ @for dir in '' $(MOSTLYCLEANDIRS); do \ -+ if test -n "$$dir" && test -d $$dir; then \ -+ echo "rmdir $$dir"; rmdir $$dir; \ -+ fi; \ -+ done; \ -+ : -diff --git a/gnulib/dummy.c b/gnulib/dummy.c -new file mode 100644 -index 0000000..ccb5c26 ---- /dev/null -+++ b/gnulib/dummy.c -@@ -0,0 +1,42 @@ -+/* A dummy file, to prevent empty libraries from breaking builds. -+ Copyright (C) 2004, 2007 Free Software Foundation, Inc. -+ -+ 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 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create -+ libraries without any object files. You might get an error like: -+ -+ > ar cru .libs/libgl.a -+ > ar: no archive members specified -+ -+ Compiling this file, and adding its object file to the library, will -+ prevent the library from being empty. */ -+ -+/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries -+ that don't export any symbol. You might get an error like: -+ -+ > cc ... libgnu.a -+ > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a -+ -+ Compiling this file, and adding its object file to the library, will -+ prevent the library from exporting no symbols. */ -+ -+#ifdef __sun -+/* This declaration ensures that the library will export at least 1 symbol. */ -+int gl_dummy_symbol; -+#else -+/* This declaration is solely to ensure that after preprocessing -+ this file is never empty. */ -+typedef int dummy; -+#endif -diff --git a/gnulib/getopt.c b/gnulib/getopt.c -new file mode 100644 -index 0000000..f1e6d1f ---- /dev/null -+++ b/gnulib/getopt.c -@@ -0,0 +1,1186 @@ -+/* Getopt for GNU. -+ NOTE: getopt is now part of the C library, so if you don't know what -+ "Keep this file name-space clean" means, talk to drepper at gnu.org -+ before changing it! -+ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef _LIBC -+# include -+#endif -+ -+#include "getopt.h" -+ -+#include -+#include -+#include -+#include -+ -+#ifdef _LIBC -+# include -+#else -+# include "gettext.h" -+# define _(msgid) gettext (msgid) -+#endif -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+# include -+#endif -+ -+#ifndef attribute_hidden -+# define attribute_hidden -+#endif -+ -+/* Unlike standard Unix `getopt', functions like `getopt_long' -+ let the user intersperse the options with the other arguments. -+ -+ As `getopt_long' works, it permutes the elements of ARGV so that, -+ when it is done, all the options precede everything else. Thus -+ all application programs are extended to handle flexible argument order. -+ -+ Using `getopt' or setting the environment variable POSIXLY_CORRECT -+ disables permutation. -+ Then the application's behavior is completely standard. -+ -+ GNU application programs can use a third alternative mode in which -+ they can distinguish the relative order of options and other arguments. */ -+ -+#include "getopt_int.h" -+ -+/* For communication from `getopt' to the caller. -+ When `getopt' finds an option that takes an argument, -+ the argument value is returned here. -+ Also, when `ordering' is RETURN_IN_ORDER, -+ each non-option ARGV-element is returned here. */ -+ -+char *optarg; -+ -+/* Index in ARGV of the next element to be scanned. -+ This is used for communication to and from the caller -+ and for communication between successive calls to `getopt'. -+ -+ On entry to `getopt', zero means this is the first call; initialize. -+ -+ When `getopt' returns -1, this is the index of the first of the -+ non-option elements that the caller should itself scan. -+ -+ Otherwise, `optind' communicates from one call to the next -+ how much of ARGV has been scanned so far. */ -+ -+/* 1003.2 says this must be 1 before any call. */ -+int optind = 1; -+ -+/* Callers store zero here to inhibit the error message -+ for unrecognized options. */ -+ -+int opterr = 1; -+ -+/* Set to an option character which was unrecognized. -+ This must be initialized on some systems to avoid linking in the -+ system's own getopt implementation. */ -+ -+int optopt = '?'; -+ -+/* Keep a global copy of all internal members of getopt_data. */ -+ -+static struct _getopt_data getopt_data; -+ -+ -+#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV -+extern char *getenv (); -+#endif -+ -+#ifdef _LIBC -+/* Stored original parameters. -+ XXX This is no good solution. We should rather copy the args so -+ that we can compare them later. But we must not use malloc(3). */ -+extern int __libc_argc; -+extern char **__libc_argv; -+ -+/* Bash 2.0 gives us an environment variable containing flags -+ indicating ARGV elements that should not be considered arguments. */ -+ -+# ifdef USE_NONOPTION_FLAGS -+/* Defined in getopt_init.c */ -+extern char *__getopt_nonoption_flags; -+# endif -+ -+# ifdef USE_NONOPTION_FLAGS -+# define SWAP_FLAGS(ch1, ch2) \ -+ if (d->__nonoption_flags_len > 0) \ -+ { \ -+ char __tmp = __getopt_nonoption_flags[ch1]; \ -+ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ -+ __getopt_nonoption_flags[ch2] = __tmp; \ -+ } -+# else -+# define SWAP_FLAGS(ch1, ch2) -+# endif -+#else /* !_LIBC */ -+# define SWAP_FLAGS(ch1, ch2) -+#endif /* _LIBC */ -+ -+/* Exchange two adjacent subsequences of ARGV. -+ One subsequence is elements [first_nonopt,last_nonopt) -+ which contains all the non-options that have been skipped so far. -+ The other is elements [last_nonopt,optind), which contains all -+ the options processed since those non-options were skipped. -+ -+ `first_nonopt' and `last_nonopt' are relocated so that they describe -+ the new indices of the non-options in ARGV after they are moved. */ -+ -+static void -+exchange (char **argv, struct _getopt_data *d) -+{ -+ int bottom = d->__first_nonopt; -+ int middle = d->__last_nonopt; -+ int top = d->optind; -+ char *tem; -+ -+ /* Exchange the shorter segment with the far end of the longer segment. -+ That puts the shorter segment into the right place. -+ It leaves the longer segment in the right place overall, -+ but it consists of two parts that need to be swapped next. */ -+ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+ /* First make sure the handling of the `__getopt_nonoption_flags' -+ string can work normally. Our top argument must be in the range -+ of the string. */ -+ if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) -+ { -+ /* We must extend the array. The user plays games with us and -+ presents new arguments. */ -+ char *new_str = malloc (top + 1); -+ if (new_str == NULL) -+ d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; -+ else -+ { -+ memset (__mempcpy (new_str, __getopt_nonoption_flags, -+ d->__nonoption_flags_max_len), -+ '\0', top + 1 - d->__nonoption_flags_max_len); -+ d->__nonoption_flags_max_len = top + 1; -+ __getopt_nonoption_flags = new_str; -+ } -+ } -+#endif -+ -+ while (top > middle && middle > bottom) -+ { -+ if (top - middle > middle - bottom) -+ { -+ /* Bottom segment is the short one. */ -+ int len = middle - bottom; -+ register int i; -+ -+ /* Swap it with the top part of the top segment. */ -+ for (i = 0; i < len; i++) -+ { -+ tem = argv[bottom + i]; -+ argv[bottom + i] = argv[top - (middle - bottom) + i]; -+ argv[top - (middle - bottom) + i] = tem; -+ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); -+ } -+ /* Exclude the moved bottom segment from further swapping. */ -+ top -= len; -+ } -+ else -+ { -+ /* Top segment is the short one. */ -+ int len = top - middle; -+ register int i; -+ -+ /* Swap it with the bottom part of the bottom segment. */ -+ for (i = 0; i < len; i++) -+ { -+ tem = argv[bottom + i]; -+ argv[bottom + i] = argv[middle + i]; -+ argv[middle + i] = tem; -+ SWAP_FLAGS (bottom + i, middle + i); -+ } -+ /* Exclude the moved top segment from further swapping. */ -+ bottom += len; -+ } -+ } -+ -+ /* Update records for the slots the non-options now occupy. */ -+ -+ d->__first_nonopt += (d->optind - d->__last_nonopt); -+ d->__last_nonopt = d->optind; -+} -+ -+/* Initialize the internal data when the first call is made. */ -+ -+static const char * -+_getopt_initialize (int argc, char **argv, const char *optstring, -+ int posixly_correct, struct _getopt_data *d) -+{ -+ /* Start processing options with ARGV-element 1 (since ARGV-element 0 -+ is the program name); the sequence of previously skipped -+ non-option ARGV-elements is empty. */ -+ -+ d->__first_nonopt = d->__last_nonopt = d->optind; -+ -+ d->__nextchar = NULL; -+ -+ d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); -+ -+ /* Determine how to handle the ordering of options and nonoptions. */ -+ -+ if (optstring[0] == '-') -+ { -+ d->__ordering = RETURN_IN_ORDER; -+ ++optstring; -+ } -+ else if (optstring[0] == '+') -+ { -+ d->__ordering = REQUIRE_ORDER; -+ ++optstring; -+ } -+ else if (d->__posixly_correct) -+ d->__ordering = REQUIRE_ORDER; -+ else -+ d->__ordering = PERMUTE; -+ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+ if (!d->__posixly_correct -+ && argc == __libc_argc && argv == __libc_argv) -+ { -+ if (d->__nonoption_flags_max_len == 0) -+ { -+ if (__getopt_nonoption_flags == NULL -+ || __getopt_nonoption_flags[0] == '\0') -+ d->__nonoption_flags_max_len = -1; -+ else -+ { -+ const char *orig_str = __getopt_nonoption_flags; -+ int len = d->__nonoption_flags_max_len = strlen (orig_str); -+ if (d->__nonoption_flags_max_len < argc) -+ d->__nonoption_flags_max_len = argc; -+ __getopt_nonoption_flags = -+ (char *) malloc (d->__nonoption_flags_max_len); -+ if (__getopt_nonoption_flags == NULL) -+ d->__nonoption_flags_max_len = -1; -+ else -+ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), -+ '\0', d->__nonoption_flags_max_len - len); -+ } -+ } -+ d->__nonoption_flags_len = d->__nonoption_flags_max_len; -+ } -+ else -+ d->__nonoption_flags_len = 0; -+#endif -+ -+ return optstring; -+} -+ -+/* Scan elements of ARGV (whose length is ARGC) for option characters -+ given in OPTSTRING. -+ -+ If an element of ARGV starts with '-', and is not exactly "-" or "--", -+ then it is an option element. The characters of this element -+ (aside from the initial '-') are option characters. If `getopt' -+ is called repeatedly, it returns successively each of the option characters -+ from each of the option elements. -+ -+ If `getopt' finds another option character, it returns that character, -+ updating `optind' and `nextchar' so that the next call to `getopt' can -+ resume the scan with the following option character or ARGV-element. -+ -+ If there are no more option characters, `getopt' returns -1. -+ Then `optind' is the index in ARGV of the first ARGV-element -+ that is not an option. (The ARGV-elements have been permuted -+ so that those that are not options now come last.) -+ -+ OPTSTRING is a string containing the legitimate option characters. -+ If an option character is seen that is not listed in OPTSTRING, -+ return '?' after printing an error message. If you set `opterr' to -+ zero, the error message is suppressed but we still return '?'. -+ -+ If a char in OPTSTRING is followed by a colon, that means it wants an arg, -+ so the following text in the same ARGV-element, or the text of the following -+ ARGV-element, is returned in `optarg'. Two colons mean an option that -+ wants an optional arg; if there is text in the current ARGV-element, -+ it is returned in `optarg', otherwise `optarg' is set to zero. -+ -+ If OPTSTRING starts with `-' or `+', it requests different methods of -+ handling the non-option ARGV-elements. -+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. -+ -+ Long-named options begin with `--' instead of `-'. -+ Their names may be abbreviated as long as the abbreviation is unique -+ or is an exact match for some defined option. If they have an -+ argument, it follows the option name in the same ARGV-element, separated -+ from the option name by a `=', or else the in next ARGV-element. -+ When `getopt' finds a long-named option, it returns 0 if that option's -+ `flag' field is nonzero, the value of the option's `val' field -+ if the `flag' field is zero. -+ -+ LONGOPTS is a vector of `struct option' terminated by an -+ element containing a name which is zero. -+ -+ LONGIND returns the index in LONGOPT of the long-named option found. -+ It is only valid when a long-named option has been found by the most -+ recent call. -+ -+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce -+ long-named options. -+ -+ If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT -+ environment variable were set. */ -+ -+int -+_getopt_internal_r (int argc, char **argv, const char *optstring, -+ const struct option *longopts, int *longind, -+ int long_only, int posixly_correct, struct _getopt_data *d) -+{ -+ int print_errors = d->opterr; -+ if (optstring[0] == ':') -+ print_errors = 0; -+ -+ if (argc < 1) -+ return -1; -+ -+ d->optarg = NULL; -+ -+ if (d->optind == 0 || !d->__initialized) -+ { -+ if (d->optind == 0) -+ d->optind = 1; /* Don't scan ARGV[0], the program name. */ -+ optstring = _getopt_initialize (argc, argv, optstring, -+ posixly_correct, d); -+ d->__initialized = 1; -+ } -+ -+ /* Test whether ARGV[optind] points to a non-option argument. -+ Either it does not have option syntax, or there is an environment flag -+ from the shell indicating it is not an option. The later information -+ is only used when the used in the GNU libc. */ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ -+ || (d->optind < d->__nonoption_flags_len \ -+ && __getopt_nonoption_flags[d->optind] == '1')) -+#else -+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') -+#endif -+ -+ if (d->__nextchar == NULL || *d->__nextchar == '\0') -+ { -+ /* Advance to the next ARGV-element. */ -+ -+ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been -+ moved back by the user (who may also have changed the arguments). */ -+ if (d->__last_nonopt > d->optind) -+ d->__last_nonopt = d->optind; -+ if (d->__first_nonopt > d->optind) -+ d->__first_nonopt = d->optind; -+ -+ if (d->__ordering == PERMUTE) -+ { -+ /* If we have just processed some options following some non-options, -+ exchange them so that the options come first. */ -+ -+ if (d->__first_nonopt != d->__last_nonopt -+ && d->__last_nonopt != d->optind) -+ exchange ((char **) argv, d); -+ else if (d->__last_nonopt != d->optind) -+ d->__first_nonopt = d->optind; -+ -+ /* Skip any additional non-options -+ and extend the range of non-options previously skipped. */ -+ -+ while (d->optind < argc && NONOPTION_P) -+ d->optind++; -+ d->__last_nonopt = d->optind; -+ } -+ -+ /* The special ARGV-element `--' means premature end of options. -+ Skip it like a null option, -+ then exchange with previous non-options as if it were an option, -+ then skip everything else like a non-option. */ -+ -+ if (d->optind != argc && !strcmp (argv[d->optind], "--")) -+ { -+ d->optind++; -+ -+ if (d->__first_nonopt != d->__last_nonopt -+ && d->__last_nonopt != d->optind) -+ exchange ((char **) argv, d); -+ else if (d->__first_nonopt == d->__last_nonopt) -+ d->__first_nonopt = d->optind; -+ d->__last_nonopt = argc; -+ -+ d->optind = argc; -+ } -+ -+ /* If we have done all the ARGV-elements, stop the scan -+ and back over any non-options that we skipped and permuted. */ -+ -+ if (d->optind == argc) -+ { -+ /* Set the next-arg-index to point at the non-options -+ that we previously skipped, so the caller will digest them. */ -+ if (d->__first_nonopt != d->__last_nonopt) -+ d->optind = d->__first_nonopt; -+ return -1; -+ } -+ -+ /* If we have come to a non-option and did not permute it, -+ either stop the scan or describe it to the caller and pass it by. */ -+ -+ if (NONOPTION_P) -+ { -+ if (d->__ordering == REQUIRE_ORDER) -+ return -1; -+ d->optarg = argv[d->optind++]; -+ return 1; -+ } -+ -+ /* We have found another option-ARGV-element. -+ Skip the initial punctuation. */ -+ -+ d->__nextchar = (argv[d->optind] + 1 -+ + (longopts != NULL && argv[d->optind][1] == '-')); -+ } -+ -+ /* Decode the current option-ARGV-element. */ -+ -+ /* Check whether the ARGV-element is a long option. -+ -+ If long_only and the ARGV-element has the form "-f", where f is -+ a valid short option, don't consider it an abbreviated form of -+ a long option that starts with f. Otherwise there would be no -+ way to give the -f short option. -+ -+ On the other hand, if there's a long option "fubar" and -+ the ARGV-element is "-fu", do consider that an abbreviation of -+ the long option, just like "--fu", and not "-f" with arg "u". -+ -+ This distinction seems to be the most useful approach. */ -+ -+ if (longopts != NULL -+ && (argv[d->optind][1] == '-' -+ || (long_only && (argv[d->optind][2] -+ || !strchr (optstring, argv[d->optind][1]))))) -+ { -+ char *nameend; -+ const struct option *p; -+ const struct option *pfound = NULL; -+ int exact = 0; -+ int ambig = 0; -+ int indfound = -1; -+ int option_index; -+ -+ for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) -+ /* Do nothing. */ ; -+ -+ /* Test all long options for either exact match -+ or abbreviated matches. */ -+ for (p = longopts, option_index = 0; p->name; p++, option_index++) -+ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) -+ { -+ if ((unsigned int) (nameend - d->__nextchar) -+ == (unsigned int) strlen (p->name)) -+ { -+ /* Exact match found. */ -+ pfound = p; -+ indfound = option_index; -+ exact = 1; -+ break; -+ } -+ else if (pfound == NULL) -+ { -+ /* First nonexact match found. */ -+ pfound = p; -+ indfound = option_index; -+ } -+ else if (long_only -+ || pfound->has_arg != p->has_arg -+ || pfound->flag != p->flag -+ || pfound->val != p->val) -+ /* Second or later nonexact match found. */ -+ ambig = 1; -+ } -+ -+ if (ambig && !exact) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), -+ argv[0], argv[d->optind]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), -+ argv[0], argv[d->optind]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optind++; -+ d->optopt = 0; -+ return '?'; -+ } -+ -+ if (pfound != NULL) -+ { -+ option_index = indfound; -+ d->optind++; -+ if (*nameend) -+ { -+ /* Don't test has_arg with >, because some C compilers don't -+ allow it to be used on enums. */ -+ if (pfound->has_arg) -+ d->optarg = nameend + 1; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (argv[d->optind - 1][1] == '-') -+ { -+ /* --option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("\ -+%s: option `--%s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#else -+ fprintf (stderr, _("\ -+%s: option `--%s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#endif -+ } -+ else -+ { -+ /* +option or -option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("\ -+%s: option `%c%s' doesn't allow an argument\n"), -+ argv[0], argv[d->optind - 1][0], -+ pfound->name); -+#else -+ fprintf (stderr, _("\ -+%s: option `%c%s' doesn't allow an argument\n"), -+ argv[0], argv[d->optind - 1][0], -+ pfound->name); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ -+ d->__nextchar += strlen (d->__nextchar); -+ -+ d->optopt = pfound->val; -+ return '?'; -+ } -+ } -+ else if (pfound->has_arg == 1) -+ { -+ if (d->optind < argc) -+ d->optarg = argv[d->optind++]; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optopt = pfound->val; -+ return optstring[0] == ':' ? ':' : '?'; -+ } -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ if (longind != NULL) -+ *longind = option_index; -+ if (pfound->flag) -+ { -+ *(pfound->flag) = pfound->val; -+ return 0; -+ } -+ return pfound->val; -+ } -+ -+ /* Can't find it as a long option. If this is not getopt_long_only, -+ or the option starts with '--' or is not a valid short -+ option, then it's an error. -+ Otherwise interpret it as a short option. */ -+ if (!long_only || argv[d->optind][1] == '-' -+ || strchr (optstring, *d->__nextchar) == NULL) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (argv[d->optind][1] == '-') -+ { -+ /* --option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), -+ argv[0], d->__nextchar); -+#else -+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), -+ argv[0], d->__nextchar); -+#endif -+ } -+ else -+ { -+ /* +option or -option */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), -+ argv[0], argv[d->optind][0], d->__nextchar); -+#else -+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), -+ argv[0], argv[d->optind][0], d->__nextchar); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ d->__nextchar = (char *) ""; -+ d->optind++; -+ d->optopt = 0; -+ return '?'; -+ } -+ } -+ -+ /* Look at and handle the next short option-character. */ -+ -+ { -+ char c = *d->__nextchar++; -+ char *temp = strchr (optstring, c); -+ -+ /* Increment `optind' when we start to process its last character. */ -+ if (*d->__nextchar == '\0') -+ ++d->optind; -+ -+ if (temp == NULL || c == ':') -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ int n; -+#endif -+ -+ if (d->__posixly_correct) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), -+ argv[0], c); -+#else -+ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); -+#endif -+ } -+ else -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), -+ argv[0], c); -+#else -+ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); -+#endif -+ } -+ -+#if defined _LIBC && defined USE_IN_LIBIO -+ if (n >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#endif -+ } -+ d->optopt = c; -+ return '?'; -+ } -+ /* Convenience. Treat POSIX -W foo same as long option --foo */ -+ if (temp[0] == 'W' && temp[1] == ';') -+ { -+ char *nameend; -+ const struct option *p; -+ const struct option *pfound = NULL; -+ int exact = 0; -+ int ambig = 0; -+ int indfound = 0; -+ int option_index; -+ -+ /* This is an option that requires an argument. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ /* If we end this ARGV-element by taking the rest as an arg, -+ we must advance to the next element now. */ -+ d->optind++; -+ } -+ else if (d->optind == argc) -+ { -+ if (print_errors) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, -+ _("%s: option requires an argument -- %c\n"), -+ argv[0], c) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option requires an argument -- %c\n"), -+ argv[0], c); -+#endif -+ } -+ d->optopt = c; -+ if (optstring[0] == ':') -+ c = ':'; -+ else -+ c = '?'; -+ return c; -+ } -+ else -+ /* We already incremented `d->optind' once; -+ increment it again when taking next ARGV-elt as argument. */ -+ d->optarg = argv[d->optind++]; -+ -+ /* optarg is now the argument, see if it's in the -+ table of longopts. */ -+ -+ for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; -+ nameend++) -+ /* Do nothing. */ ; -+ -+ /* Test all long options for either exact match -+ or abbreviated matches. */ -+ for (p = longopts, option_index = 0; p->name; p++, option_index++) -+ if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) -+ { -+ if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) -+ { -+ /* Exact match found. */ -+ pfound = p; -+ indfound = option_index; -+ exact = 1; -+ break; -+ } -+ else if (pfound == NULL) -+ { -+ /* First nonexact match found. */ -+ pfound = p; -+ indfound = option_index; -+ } -+ else -+ /* Second or later nonexact match found. */ -+ ambig = 1; -+ } -+ if (ambig && !exact) -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), -+ argv[0], argv[d->optind]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), -+ argv[0], argv[d->optind]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ d->optind++; -+ return '?'; -+ } -+ if (pfound != NULL) -+ { -+ option_index = indfound; -+ if (*nameend) -+ { -+ /* Don't test has_arg with >, because some C compilers don't -+ allow it to be used on enums. */ -+ if (pfound->has_arg) -+ d->optarg = nameend + 1; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `-W %s' doesn't allow an argument\n"), -+ argv[0], pfound->name) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, _("\ -+%s: option `-W %s' doesn't allow an argument\n"), -+ argv[0], pfound->name); -+#endif -+ } -+ -+ d->__nextchar += strlen (d->__nextchar); -+ return '?'; -+ } -+ } -+ else if (pfound->has_arg == 1) -+ { -+ if (d->optind < argc) -+ d->optarg = argv[d->optind++]; -+ else -+ { -+ if (print_errors) -+ { -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 -+ |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option `%s' requires an argument\n"), -+ argv[0], argv[d->optind - 1]); -+#endif -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ return optstring[0] == ':' ? ':' : '?'; -+ } -+ } -+ d->__nextchar += strlen (d->__nextchar); -+ if (longind != NULL) -+ *longind = option_index; -+ if (pfound->flag) -+ { -+ *(pfound->flag) = pfound->val; -+ return 0; -+ } -+ return pfound->val; -+ } -+ d->__nextchar = NULL; -+ return 'W'; /* Let the application handle it. */ -+ } -+ if (temp[1] == ':') -+ { -+ if (temp[2] == ':') -+ { -+ /* This is an option that accepts an argument optionally. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ d->optind++; -+ } -+ else -+ d->optarg = NULL; -+ d->__nextchar = NULL; -+ } -+ else -+ { -+ /* This is an option that requires an argument. */ -+ if (*d->__nextchar != '\0') -+ { -+ d->optarg = d->__nextchar; -+ /* If we end this ARGV-element by taking the rest as an arg, -+ we must advance to the next element now. */ -+ d->optind++; -+ } -+ else if (d->optind == argc) -+ { -+ if (print_errors) -+ { -+ /* 1003.2 specifies the format of this message. */ -+#if defined _LIBC && defined USE_IN_LIBIO -+ char *buf; -+ -+ if (__asprintf (&buf, _("\ -+%s: option requires an argument -- %c\n"), -+ argv[0], c) >= 0) -+ { -+ _IO_flockfile (stderr); -+ -+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2; -+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; -+ -+ __fxprintf (NULL, "%s", buf); -+ -+ ((_IO_FILE *) stderr)->_flags2 = old_flags2; -+ _IO_funlockfile (stderr); -+ -+ free (buf); -+ } -+#else -+ fprintf (stderr, -+ _("%s: option requires an argument -- %c\n"), -+ argv[0], c); -+#endif -+ } -+ d->optopt = c; -+ if (optstring[0] == ':') -+ c = ':'; -+ else -+ c = '?'; -+ } -+ else -+ /* We already incremented `optind' once; -+ increment it again when taking next ARGV-elt as argument. */ -+ d->optarg = argv[d->optind++]; -+ d->__nextchar = NULL; -+ } -+ } -+ return c; -+ } -+} -+ -+int -+_getopt_internal (int argc, char **argv, const char *optstring, -+ const struct option *longopts, int *longind, -+ int long_only, int posixly_correct) -+{ -+ int result; -+ -+ getopt_data.optind = optind; -+ getopt_data.opterr = opterr; -+ -+ result = _getopt_internal_r (argc, argv, optstring, longopts, longind, -+ long_only, posixly_correct, &getopt_data); -+ -+ optind = getopt_data.optind; -+ optarg = getopt_data.optarg; -+ optopt = getopt_data.optopt; -+ -+ return result; -+} -+ -+/* glibc gets a LSB-compliant getopt. -+ Standalone applications get a POSIX-compliant getopt. */ -+#if _LIBC -+enum { POSIXLY_CORRECT = 0 }; -+#else -+enum { POSIXLY_CORRECT = 1 }; -+#endif -+ -+int -+getopt (int argc, char *const *argv, const char *optstring) -+{ -+ return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0, -+ POSIXLY_CORRECT); -+} -+ -+ -+#ifdef TEST -+ -+/* Compile with -DTEST to make an executable for use in testing -+ the above definition of `getopt'. */ -+ -+int -+main (int argc, char **argv) -+{ -+ int c; -+ int digit_optind = 0; -+ -+ while (1) -+ { -+ int this_option_optind = optind ? optind : 1; -+ -+ c = getopt (argc, argv, "abc:d:0123456789"); -+ if (c == -1) -+ break; -+ -+ switch (c) -+ { -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ case '4': -+ case '5': -+ case '6': -+ case '7': -+ case '8': -+ case '9': -+ if (digit_optind != 0 && digit_optind != this_option_optind) -+ printf ("digits occur in two different argv-elements.\n"); -+ digit_optind = this_option_optind; -+ printf ("option %c\n", c); -+ break; -+ -+ case 'a': -+ printf ("option a\n"); -+ break; -+ -+ case 'b': -+ printf ("option b\n"); -+ break; -+ -+ case 'c': -+ printf ("option c with value `%s'\n", optarg); -+ break; -+ -+ case '?': -+ break; -+ -+ default: -+ printf ("?? getopt returned character code 0%o ??\n", c); -+ } -+ } -+ -+ if (optind < argc) -+ { -+ printf ("non-option ARGV-elements: "); -+ while (optind < argc) -+ printf ("%s ", argv[optind++]); -+ printf ("\n"); -+ } -+ -+ exit (0); -+} -+ -+#endif /* TEST */ -diff --git a/gnulib/getopt.in.h b/gnulib/getopt.in.h -new file mode 100644 -index 0000000..15c213f ---- /dev/null -+++ b/gnulib/getopt.in.h -@@ -0,0 +1,242 @@ -+/* Declarations for getopt. -+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005,2006,2007,2009 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef _GL_GETOPT_H -+ -+#if __GNUC__ >= 3 -+ at PRAGMA_SYSTEM_HEADER@ -+#endif -+ -+/* The include_next requires a split double-inclusion guard. */ -+#if @HAVE_GETOPT_H@ -+# @INCLUDE_NEXT@ @NEXT_GETOPT_H@ -+#endif -+ -+#ifndef _GL_GETOPT_H -+ -+#ifndef __need_getopt -+# define _GL_GETOPT_H 1 -+#endif -+ -+/* Standalone applications should #define __GETOPT_PREFIX to an -+ identifier that prefixes the external functions and variables -+ defined in this header. When this happens, include the -+ headers that might declare getopt so that they will not cause -+ confusion if included after this file (if the system had , -+ we have already included it). Then systematically rename -+ identifiers so that they do not collide with the system functions -+ and variables. Renaming avoids problems with some compilers and -+ linkers. */ -+#if defined __GETOPT_PREFIX && !defined __need_getopt -+# if !@HAVE_GETOPT_H@ -+# include -+# include -+# include -+# endif -+# undef __need_getopt -+# undef getopt -+# undef getopt_long -+# undef getopt_long_only -+# undef optarg -+# undef opterr -+# undef optind -+# undef optopt -+# undef option -+# define __GETOPT_CONCAT(x, y) x ## y -+# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) -+# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) -+# define getopt __GETOPT_ID (getopt) -+# define getopt_long __GETOPT_ID (getopt_long) -+# define getopt_long_only __GETOPT_ID (getopt_long_only) -+# define optarg __GETOPT_ID (optarg) -+# define opterr __GETOPT_ID (opterr) -+# define optind __GETOPT_ID (optind) -+# define optopt __GETOPT_ID (optopt) -+# define option __GETOPT_ID (option) -+#endif -+ -+/* Standalone applications get correct prototypes for getopt_long and -+ getopt_long_only; they declare "char **argv". libc uses prototypes -+ with "char *const *argv" that are incorrect because getopt_long and -+ getopt_long_only can permute argv; this is required for backward -+ compatibility (e.g., for LSB 2.0.1). -+ -+ This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt', -+ but it caused redefinition warnings if both unistd.h and getopt.h were -+ included, since unistd.h includes getopt.h having previously defined -+ __need_getopt. -+ -+ The only place where __getopt_argv_const is used is in definitions -+ of getopt_long and getopt_long_only below, but these are visible -+ only if __need_getopt is not defined, so it is quite safe to rewrite -+ the conditional as follows: -+*/ -+#if !defined __need_getopt -+# if defined __GETOPT_PREFIX -+# define __getopt_argv_const /* empty */ -+# else -+# define __getopt_argv_const const -+# endif -+#endif -+ -+/* If __GNU_LIBRARY__ is not already defined, either we are being used -+ standalone, or this is the first header included in the source file. -+ If we are being used with glibc, we need to include , but -+ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is -+ not defined, include , which will pull in for us -+ if it's from glibc. (Why ctype.h? It's guaranteed to exist and it -+ doesn't flood the namespace with stuff the way some other headers do.) */ -+#if !defined __GNU_LIBRARY__ -+# include -+#endif -+ -+#ifndef __THROW -+# ifndef __GNUC_PREREQ -+# define __GNUC_PREREQ(maj, min) (0) -+# endif -+# if defined __cplusplus && __GNUC_PREREQ (2,8) -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* For communication from `getopt' to the caller. -+ When `getopt' finds an option that takes an argument, -+ the argument value is returned here. -+ Also, when `ordering' is RETURN_IN_ORDER, -+ each non-option ARGV-element is returned here. */ -+ -+extern char *optarg; -+ -+/* Index in ARGV of the next element to be scanned. -+ This is used for communication to and from the caller -+ and for communication between successive calls to `getopt'. -+ -+ On entry to `getopt', zero means this is the first call; initialize. -+ -+ When `getopt' returns -1, this is the index of the first of the -+ non-option elements that the caller should itself scan. -+ -+ Otherwise, `optind' communicates from one call to the next -+ how much of ARGV has been scanned so far. */ -+ -+extern int optind; -+ -+/* Callers store zero here to inhibit the error message `getopt' prints -+ for unrecognized options. */ -+ -+extern int opterr; -+ -+/* Set to an option character which was unrecognized. */ -+ -+extern int optopt; -+ -+#ifndef __need_getopt -+/* Describe the long-named options requested by the application. -+ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector -+ of `struct option' terminated by an element containing a name which is -+ zero. -+ -+ The field `has_arg' is: -+ no_argument (or 0) if the option does not take an argument, -+ required_argument (or 1) if the option requires an argument, -+ optional_argument (or 2) if the option takes an optional argument. -+ -+ If the field `flag' is not NULL, it points to a variable that is set -+ to the value given in the field `val' when the option is found, but -+ left unchanged if the option is not found. -+ -+ To have a long-named option do something other than set an `int' to -+ a compiled-in constant, such as set a value from `optarg', set the -+ option's `flag' field to zero and its `val' field to a nonzero -+ value (the equivalent single-letter option character, if there is -+ one). For long options that have a zero `flag' field, `getopt' -+ returns the contents of the `val' field. */ -+ -+struct option -+{ -+ const char *name; -+ /* has_arg can't be an enum because some compilers complain about -+ type mismatches in all the code that assumes it is an int. */ -+ int has_arg; -+ int *flag; -+ int val; -+}; -+ -+/* Names for the values of the `has_arg' field of `struct option'. */ -+ -+# define no_argument 0 -+# define required_argument 1 -+# define optional_argument 2 -+#endif /* need getopt */ -+ -+ -+/* Get definitions and prototypes for functions to process the -+ arguments in ARGV (ARGC of them, minus the program name) for -+ options given in OPTS. -+ -+ Return the option character from OPTS just read. Return -1 when -+ there are no more options. For unrecognized options, or options -+ missing arguments, `optopt' is set to the option letter, and '?' is -+ returned. -+ -+ The OPTS string is a list of characters which are recognized option -+ letters, optionally followed by colons, specifying that that letter -+ takes an argument, to be placed in `optarg'. -+ -+ If a letter in OPTS is followed by two colons, its argument is -+ optional. This behavior is specific to the GNU `getopt'. -+ -+ The argument `--' causes premature termination of argument -+ scanning, explicitly telling `getopt' that there are no more -+ options. -+ -+ If OPTS begins with `-', then non-option arguments are treated as -+ arguments to the option '\1'. This behavior is specific to the GNU -+ `getopt'. If OPTS begins with `+', or POSIXLY_CORRECT is set in -+ the environment, then do not permute arguments. */ -+ -+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) -+ __THROW; -+ -+#ifndef __need_getopt -+extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, -+ const char *__shortopts, -+ const struct option *__longopts, int *__longind) -+ __THROW; -+extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, -+ const char *__shortopts, -+ const struct option *__longopts, int *__longind) -+ __THROW; -+ -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+/* Make sure we later can get all the definitions and declarations. */ -+#undef __need_getopt -+ -+#endif /* getopt.h */ -+#endif /* getopt.h */ -diff --git a/gnulib/getopt1.c b/gnulib/getopt1.c -new file mode 100644 -index 0000000..ba115c4 ---- /dev/null -+++ b/gnulib/getopt1.c -@@ -0,0 +1,170 @@ -+/* getopt_long and getopt_long_only entry points for GNU getopt. -+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006,2009 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifdef _LIBC -+# include -+#else -+# include -+# include "getopt.h" -+#endif -+#include "getopt_int.h" -+ -+#include -+ -+/* This needs to come after some library #include -+ to get __GNU_LIBRARY__ defined. */ -+#ifdef __GNU_LIBRARY__ -+#include -+#endif -+ -+#ifndef NULL -+#define NULL 0 -+#endif -+ -+int -+getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, -+ const struct option *long_options, int *opt_index) -+{ -+ return _getopt_internal (argc, (char **) argv, options, long_options, -+ opt_index, 0, 0); -+} -+ -+int -+_getopt_long_r (int argc, char **argv, const char *options, -+ const struct option *long_options, int *opt_index, -+ struct _getopt_data *d) -+{ -+ return _getopt_internal_r (argc, argv, options, long_options, opt_index, -+ 0, 0, d); -+} -+ -+/* Like getopt_long, but '-' as well as '--' can indicate a long option. -+ If an option that starts with '-' (not '--') doesn't match a long option, -+ but does match a short option, it is parsed as a short option -+ instead. */ -+ -+int -+getopt_long_only (int argc, char *__getopt_argv_const *argv, -+ const char *options, -+ const struct option *long_options, int *opt_index) -+{ -+ return _getopt_internal (argc, (char **) argv, options, long_options, -+ opt_index, 1, 0); -+} -+ -+int -+_getopt_long_only_r (int argc, char **argv, const char *options, -+ const struct option *long_options, int *opt_index, -+ struct _getopt_data *d) -+{ -+ return _getopt_internal_r (argc, argv, options, long_options, opt_index, -+ 1, 0, d); -+} -+ -+ -+#ifdef TEST -+ -+#include -+ -+int -+main (int argc, char **argv) -+{ -+ int c; -+ int digit_optind = 0; -+ -+ while (1) -+ { -+ int this_option_optind = optind ? optind : 1; -+ int option_index = 0; -+ static const struct option long_options[] = -+ { -+ {"add", 1, 0, 0}, -+ {"append", 0, 0, 0}, -+ {"delete", 1, 0, 0}, -+ {"verbose", 0, 0, 0}, -+ {"create", 0, 0, 0}, -+ {"file", 1, 0, 0}, -+ {0, 0, 0, 0} -+ }; -+ -+ c = getopt_long (argc, argv, "abc:d:0123456789", -+ long_options, &option_index); -+ if (c == -1) -+ break; -+ -+ switch (c) -+ { -+ case 0: -+ printf ("option %s", long_options[option_index].name); -+ if (optarg) -+ printf (" with arg %s", optarg); -+ printf ("\n"); -+ break; -+ -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ case '4': -+ case '5': -+ case '6': -+ case '7': -+ case '8': -+ case '9': -+ if (digit_optind != 0 && digit_optind != this_option_optind) -+ printf ("digits occur in two different argv-elements.\n"); -+ digit_optind = this_option_optind; -+ printf ("option %c\n", c); -+ break; -+ -+ case 'a': -+ printf ("option a\n"); -+ break; -+ -+ case 'b': -+ printf ("option b\n"); -+ break; -+ -+ case 'c': -+ printf ("option c with value `%s'\n", optarg); -+ break; -+ -+ case 'd': -+ printf ("option d with value `%s'\n", optarg); -+ break; -+ -+ case '?': -+ break; -+ -+ default: -+ printf ("?? getopt returned character code 0%o ??\n", c); -+ } -+ } -+ -+ if (optind < argc) -+ { -+ printf ("non-option ARGV-elements: "); -+ while (optind < argc) -+ printf ("%s ", argv[optind++]); -+ printf ("\n"); -+ } -+ -+ exit (0); -+} -+ -+#endif /* TEST */ -diff --git a/gnulib/getopt_int.h b/gnulib/getopt_int.h -new file mode 100644 -index 0000000..3c6628b ---- /dev/null -+++ b/gnulib/getopt_int.h -@@ -0,0 +1,130 @@ -+/* Internal declarations for getopt. -+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004 -+ Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ 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 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef _GETOPT_INT_H -+#define _GETOPT_INT_H 1 -+ -+extern int _getopt_internal (int ___argc, char **___argv, -+ const char *__shortopts, -+ const struct option *__longopts, int *__longind, -+ int __long_only, int __posixly_correct); -+ -+ -+/* Reentrant versions which can handle parsing multiple argument -+ vectors at the same time. */ -+ -+/* Data type for reentrant functions. */ -+struct _getopt_data -+{ -+ /* These have exactly the same meaning as the corresponding global -+ variables, except that they are used for the reentrant -+ versions of getopt. */ -+ int optind; -+ int opterr; -+ int optopt; -+ char *optarg; -+ -+ /* Internal members. */ -+ -+ /* True if the internal members have been initialized. */ -+ int __initialized; -+ -+ /* The next char to be scanned in the option-element -+ in which the last option character we returned was found. -+ This allows us to pick up the scan where we left off. -+ -+ If this is zero, or a null string, it means resume the scan -+ by advancing to the next ARGV-element. */ -+ char *__nextchar; -+ -+ /* Describe how to deal with options that follow non-option ARGV-elements. -+ -+ If the caller did not specify anything, -+ the default is REQUIRE_ORDER if the environment variable -+ POSIXLY_CORRECT is defined, PERMUTE otherwise. -+ -+ REQUIRE_ORDER means don't recognize them as options; -+ stop option processing when the first non-option is seen. -+ This is what Unix does. -+ This mode of operation is selected by either setting the environment -+ variable POSIXLY_CORRECT, or using `+' as the first character -+ of the list of option characters, or by calling getopt. -+ -+ PERMUTE is the default. We permute the contents of ARGV as we -+ scan, so that eventually all the non-options are at the end. -+ This allows options to be given in any order, even with programs -+ that were not written to expect this. -+ -+ RETURN_IN_ORDER is an option available to programs that were -+ written to expect options and other ARGV-elements in any order -+ and that care about the ordering of the two. We describe each -+ non-option ARGV-element as if it were the argument of an option -+ with character code 1. Using `-' as the first character of the -+ list of option characters selects this mode of operation. -+ -+ The special argument `--' forces an end of option-scanning regardless -+ of the value of `ordering'. In the case of RETURN_IN_ORDER, only -+ `--' can cause `getopt' to return -1 with `optind' != ARGC. */ -+ -+ enum -+ { -+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER -+ } __ordering; -+ -+ /* If the POSIXLY_CORRECT environment variable is set -+ or getopt was called. */ -+ int __posixly_correct; -+ -+ -+ /* Handle permutation of arguments. */ -+ -+ /* Describe the part of ARGV that contains non-options that have -+ been skipped. `first_nonopt' is the index in ARGV of the first -+ of them; `last_nonopt' is the index after the last of them. */ -+ -+ int __first_nonopt; -+ int __last_nonopt; -+ -+#if defined _LIBC && defined USE_NONOPTION_FLAGS -+ int __nonoption_flags_max_len; -+ int __nonoption_flags_len; -+# endif -+}; -+ -+/* The initializer is necessary to set OPTIND and OPTERR to their -+ default values and to clear the initialization flag. */ -+#define _GETOPT_DATA_INITIALIZER { 1, 1 } -+ -+extern int _getopt_internal_r (int ___argc, char **___argv, -+ const char *__shortopts, -+ const struct option *__longopts, int *__longind, -+ int __long_only, int __posixly_correct, -+ struct _getopt_data *__data); -+ -+extern int _getopt_long_r (int ___argc, char **___argv, -+ const char *__shortopts, -+ const struct option *__longopts, int *__longind, -+ struct _getopt_data *__data); -+ -+extern int _getopt_long_only_r (int ___argc, char **___argv, -+ const char *__shortopts, -+ const struct option *__longopts, -+ int *__longind, -+ struct _getopt_data *__data); -+ -+#endif /* getopt_int.h */ -diff --git a/gnulib/gettext.h b/gnulib/gettext.h -new file mode 100644 -index 0000000..8cf2dca ---- /dev/null -+++ b/gnulib/gettext.h -@@ -0,0 +1,279 @@ -+/* Convenience header for conditional use of GNU . -+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 Free Software Foundation, Inc. -+ -+ 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 3, 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. */ -+ -+#ifndef _LIBGETTEXT_H -+#define _LIBGETTEXT_H 1 -+ -+/* NLS can be disabled through the configure --disable-nls option. */ -+#if ENABLE_NLS -+ -+/* Get declarations of GNU message catalog functions. */ -+# include -+ -+/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by -+ the gettext() and ngettext() macros. This is an alternative to calling -+ textdomain(), and is useful for libraries. */ -+# ifdef DEFAULT_TEXT_DOMAIN -+# undef gettext -+# define gettext(Msgid) \ -+ dgettext (DEFAULT_TEXT_DOMAIN, Msgid) -+# undef ngettext -+# define ngettext(Msgid1, Msgid2, N) \ -+ dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N) -+# endif -+ -+#else -+ -+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which -+ chokes if dcgettext is defined as a macro. So include it now, to make -+ later inclusions of a NOP. We don't include -+ as well because people using "gettext.h" will not include , -+ and also including would fail on SunOS 4, whereas -+ is OK. */ -+#if defined(__sun) -+# include -+#endif -+ -+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include -+ , which chokes if dcgettext is defined as a macro. So include -+ it now, to make later inclusions of a NOP. */ -+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) -+# include -+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H -+# include -+# endif -+#endif -+ -+/* Disabled NLS. -+ The casts to 'const char *' serve the purpose of producing warnings -+ for invalid uses of the value returned from these functions. -+ On pre-ANSI systems without 'const', the config.h file is supposed to -+ contain "#define const". */ -+# undef gettext -+# define gettext(Msgid) ((const char *) (Msgid)) -+# undef dgettext -+# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) -+# undef dcgettext -+# define dcgettext(Domainname, Msgid, Category) \ -+ ((void) (Category), dgettext (Domainname, Msgid)) -+# undef ngettext -+# define ngettext(Msgid1, Msgid2, N) \ -+ ((N) == 1 \ -+ ? ((void) (Msgid2), (const char *) (Msgid1)) \ -+ : ((void) (Msgid1), (const char *) (Msgid2))) -+# undef dngettext -+# define dngettext(Domainname, Msgid1, Msgid2, N) \ -+ ((void) (Domainname), ngettext (Msgid1, Msgid2, N)) -+# undef dcngettext -+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ -+ ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N)) -+# undef textdomain -+# define textdomain(Domainname) ((const char *) (Domainname)) -+# undef bindtextdomain -+# define bindtextdomain(Domainname, Dirname) \ -+ ((void) (Domainname), (const char *) (Dirname)) -+# undef bind_textdomain_codeset -+# define bind_textdomain_codeset(Domainname, Codeset) \ -+ ((void) (Domainname), (const char *) (Codeset)) -+ -+#endif -+ -+/* A pseudo function call that serves as a marker for the automated -+ extraction of messages, but does not call gettext(). The run-time -+ translation is done at a different place in the code. -+ The argument, String, should be a literal string. Concatenated strings -+ and other string expressions won't work. -+ The macro's expansion is not parenthesized, so that it is suitable as -+ initializer for static 'char[]' or 'const char[]' variables. */ -+#define gettext_noop(String) String -+ -+/* The separator between msgctxt and msgid in a .mo file. */ -+#define GETTEXT_CONTEXT_GLUE "\004" -+ -+/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a -+ MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be -+ short and rarely need to change. -+ The letter 'p' stands for 'particular' or 'special'. */ -+#ifdef DEFAULT_TEXT_DOMAIN -+# define pgettext(Msgctxt, Msgid) \ -+ pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -+#else -+# define pgettext(Msgctxt, Msgid) \ -+ pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -+#endif -+#define dpgettext(Domainname, Msgctxt, Msgid) \ -+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -+#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ -+ pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) -+#ifdef DEFAULT_TEXT_DOMAIN -+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ -+ npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -+#else -+# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ -+ npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -+#endif -+#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ -+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -+#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ -+ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) -+ -+#ifdef __GNUC__ -+__inline -+#else -+#ifdef __cplusplus -+inline -+#endif -+#endif -+static const char * -+pgettext_aux (const char *domain, -+ const char *msg_ctxt_id, const char *msgid, -+ int category) -+{ -+ const char *translation = dcgettext (domain, msg_ctxt_id, category); -+ if (translation == msg_ctxt_id) -+ return msgid; -+ else -+ return translation; -+} -+ -+#ifdef __GNUC__ -+__inline -+#else -+#ifdef __cplusplus -+inline -+#endif -+#endif -+static const char * -+npgettext_aux (const char *domain, -+ const char *msg_ctxt_id, const char *msgid, -+ const char *msgid_plural, unsigned long int n, -+ int category) -+{ -+ const char *translation = -+ dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); -+ if (translation == msg_ctxt_id || translation == msgid_plural) -+ return (n == 1 ? msgid : msgid_plural); -+ else -+ return translation; -+} -+ -+/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID -+ can be arbitrary expressions. But for string literals these macros are -+ less efficient than those above. */ -+ -+#include -+ -+#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ -+ (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ -+ /* || __STDC_VERSION__ >= 199901L */ ) -+ -+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -+#include -+#endif -+ -+#define pgettext_expr(Msgctxt, Msgid) \ -+ dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES) -+#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ -+ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) -+ -+#ifdef __GNUC__ -+__inline -+#else -+#ifdef __cplusplus -+inline -+#endif -+#endif -+static const char * -+dcpgettext_expr (const char *domain, -+ const char *msgctxt, const char *msgid, -+ int category) -+{ -+ size_t msgctxt_len = strlen (msgctxt) + 1; -+ size_t msgid_len = strlen (msgid) + 1; -+ const char *translation; -+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -+ char msg_ctxt_id[msgctxt_len + msgid_len]; -+#else -+ char buf[1024]; -+ char *msg_ctxt_id = -+ (msgctxt_len + msgid_len <= sizeof (buf) -+ ? buf -+ : (char *) malloc (msgctxt_len + msgid_len)); -+ if (msg_ctxt_id != NULL) -+#endif -+ { -+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); -+ msg_ctxt_id[msgctxt_len - 1] = '\004'; -+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); -+ translation = dcgettext (domain, msg_ctxt_id, category); -+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -+ if (msg_ctxt_id != buf) -+ free (msg_ctxt_id); -+#endif -+ if (translation != msg_ctxt_id) -+ return translation; -+ } -+ return msgid; -+} -+ -+#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \ -+ dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) -+#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ -+ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) -+ -+#ifdef __GNUC__ -+__inline -+#else -+#ifdef __cplusplus -+inline -+#endif -+#endif -+static const char * -+dcnpgettext_expr (const char *domain, -+ const char *msgctxt, const char *msgid, -+ const char *msgid_plural, unsigned long int n, -+ int category) -+{ -+ size_t msgctxt_len = strlen (msgctxt) + 1; -+ size_t msgid_len = strlen (msgid) + 1; -+ const char *translation; -+#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -+ char msg_ctxt_id[msgctxt_len + msgid_len]; -+#else -+ char buf[1024]; -+ char *msg_ctxt_id = -+ (msgctxt_len + msgid_len <= sizeof (buf) -+ ? buf -+ : (char *) malloc (msgctxt_len + msgid_len)); -+ if (msg_ctxt_id != NULL) -+#endif -+ { -+ memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); -+ msg_ctxt_id[msgctxt_len - 1] = '\004'; -+ memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); -+ translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); -+#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS -+ if (msg_ctxt_id != buf) -+ free (msg_ctxt_id); -+#endif -+ if (!(translation == msg_ctxt_id || translation == msgid_plural)) -+ return translation; -+ } -+ return (n == 1 ? msgid : msgid_plural); -+} -+ -+#endif /* _LIBGETTEXT_H */ -diff --git a/gnulib/m4/00gnulib.m4 b/gnulib/m4/00gnulib.m4 -new file mode 100644 -index 0000000..d4d04d1 ---- /dev/null -+++ b/gnulib/m4/00gnulib.m4 -@@ -0,0 +1,30 @@ -+# 00gnulib.m4 serial 2 -+dnl Copyright (C) 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. -+ -+dnl This file must be named something that sorts before all other -+dnl gnulib-provided .m4 files. It is needed until such time as we can -+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. -+ -+# AC_DEFUN_ONCE([NAME], VALUE) -+# ---------------------------- -+# Define NAME to expand to VALUE on the first use (whether by direct -+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. -+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This -+# definition is slower than the version in Autoconf 2.64, because it -+# can only use interfaces that existed since 2.59; but it achieves the -+# same effect. Quoting is necessary to avoid confusing Automake. -+m4_version_prereq([2.63.263], [], -+[m4_define([AC][_DEFUN_ONCE], -+ [AC][_DEFUN([$1], -+ [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], -+ [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl -+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) -+ -+# gl_00GNULIB -+# ----------- -+# Witness macro that this file has been included. Needed to force -+# Automake to include this file prior to all other gnulib .m4 files. -+AC_DEFUN([gl_00GNULIB]) -diff --git a/gnulib/m4/extensions.m4 b/gnulib/m4/extensions.m4 -new file mode 100644 -index 0000000..ba6d5e1 ---- /dev/null -+++ b/gnulib/m4/extensions.m4 -@@ -0,0 +1,104 @@ -+# serial 8 -*- Autoconf -*- -+# Enable extensions on systems that normally disable them. -+ -+# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS -+# Autoconf. Perhaps we can remove this once we can assume Autoconf -+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly -+# enough in this area it's likely we'll need to redefine -+# AC_USE_SYSTEM_EXTENSIONS for quite some time. -+ -+# AC_USE_SYSTEM_EXTENSIONS -+# ------------------------ -+# Enable extensions on systems that normally disable them, -+# typically due to standards-conformance issues. -+# Remember that #undef in AH_VERBATIM gets replaced with #define by -+# AC_DEFINE. The goal here is to define all known feature-enabling -+# macros, then, if reports of conflicts are made, disable macros that -+# cause problems on some platforms (such as __EXTENSIONS__). -+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], -+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl -+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl -+ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ -+ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) -+ if test "$MINIX" = yes; then -+ AC_DEFINE([_POSIX_SOURCE], [1], -+ [Define to 1 if you need to in order for `stat' and other -+ things to work.]) -+ AC_DEFINE([_POSIX_1_SOURCE], [2], -+ [Define to 2 if the system does not provide POSIX.1 features -+ except with this defined.]) -+ AC_DEFINE([_MINIX], [1], -+ [Define to 1 if on MINIX.]) -+ fi -+ -+ dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500, -+ dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already -+ dnl provided. -+ case "$host_os" in -+ hpux*) -+ AC_DEFINE([_XOPEN_SOURCE], [500], -+ [Define to 500 only on HP-UX.]) -+ ;; -+ esac -+ -+ AH_VERBATIM([__EXTENSIONS__], -+[/* Enable extensions on AIX 3, Interix. */ -+#ifndef _ALL_SOURCE -+# undef _ALL_SOURCE -+#endif -+/* Enable GNU extensions on systems that have them. */ -+#ifndef _GNU_SOURCE -+# undef _GNU_SOURCE -+#endif -+/* Enable threading extensions on Solaris. */ -+#ifndef _POSIX_PTHREAD_SEMANTICS -+# undef _POSIX_PTHREAD_SEMANTICS -+#endif -+/* Enable extensions on HP NonStop. */ -+#ifndef _TANDEM_SOURCE -+# undef _TANDEM_SOURCE -+#endif -+/* Enable general extensions on Solaris. */ -+#ifndef __EXTENSIONS__ -+# undef __EXTENSIONS__ -+#endif -+]) -+ AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], -+ [ac_cv_safe_to_define___extensions__], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+# define __EXTENSIONS__ 1 -+ ]AC_INCLUDES_DEFAULT])], -+ [ac_cv_safe_to_define___extensions__=yes], -+ [ac_cv_safe_to_define___extensions__=no])]) -+ test $ac_cv_safe_to_define___extensions__ = yes && -+ AC_DEFINE([__EXTENSIONS__]) -+ AC_DEFINE([_ALL_SOURCE]) -+ AC_DEFINE([_GNU_SOURCE]) -+ AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) -+ AC_DEFINE([_TANDEM_SOURCE]) -+])# AC_USE_SYSTEM_EXTENSIONS -+ -+# gl_USE_SYSTEM_EXTENSIONS -+# ------------------------ -+# Enable extensions on systems that normally disable them, -+# typically due to standards-conformance issues. -+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], -+[ -+ dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. -+ dnl gnulib does not need it. But if it gets required by third-party macros -+ dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a -+ dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". -+ dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, -+ dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. -+ AC_REQUIRE([AC_GNU_SOURCE]) -+ -+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -+]) -diff --git a/gnulib/m4/getopt.m4 b/gnulib/m4/getopt.m4 -new file mode 100644 -index 0000000..53a1a7e ---- /dev/null -+++ b/gnulib/m4/getopt.m4 -@@ -0,0 +1,250 @@ -+# getopt.m4 serial 22 -+dnl Copyright (C) 2002-2006, 2008-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. -+ -+# Request a POSIX compliant getopt function. -+AC_DEFUN([gl_FUNC_GETOPT_POSIX], -+[ -+ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) -+ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+ gl_GETOPT_IFELSE([ -+ gl_REPLACE_GETOPT -+ ], -+ []) -+]) -+ -+# Request a POSIX compliant getopt function with GNU extensions (such as -+# options with optional arguments) and the functions getopt_long, -+# getopt_long_only. -+AC_DEFUN([gl_FUNC_GETOPT_GNU], -+[ -+ m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) -+ -+ AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) -+]) -+ -+# Request the gnulib implementation of the getopt functions unconditionally. -+# argp.m4 uses this. -+AC_DEFUN([gl_REPLACE_GETOPT], -+[ -+ dnl Arrange for getopt.h to be created. -+ gl_GETOPT_SUBSTITUTE_HEADER -+ dnl Arrange for unistd.h to include getopt.h. -+ GNULIB_UNISTD_H_GETOPT=1 -+ dnl Arrange to compile the getopt implementation. -+ AC_LIBOBJ([getopt]) -+ AC_LIBOBJ([getopt1]) -+ gl_PREREQ_GETOPT -+]) -+ -+# emacs' configure.in uses this. -+AC_DEFUN([gl_GETOPT_IFELSE], -+[ -+ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS]) -+ AS_IF([test -n "$gl_replace_getopt"], [$1], [$2]) -+]) -+ -+# Determine whether to replace the entire getopt facility. -+AC_DEFUN([gl_GETOPT_CHECK_HEADERS], -+[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ -+ dnl Persuade Solaris to declare optarg, optind, opterr, optopt. -+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -+ -+ gl_CHECK_NEXT_HEADERS([getopt.h]) -+ AC_CHECK_HEADERS_ONCE([getopt.h]) -+ if test $ac_cv_header_getopt_h = yes; then -+ HAVE_GETOPT_H=1 -+ else -+ HAVE_GETOPT_H=0 -+ fi -+ AC_SUBST([HAVE_GETOPT_H]) -+ -+ gl_replace_getopt= -+ -+ dnl Test whether is available. -+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then -+ AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes]) -+ fi -+ -+ dnl Test whether the function getopt_long is available. -+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then -+ AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) -+ fi -+ -+ dnl BSD getopt_long uses an incompatible method to reset option processing, -+ dnl but the testsuite does not show a need to use this 'optreset' variable. -+ if false && test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then -+ AC_CHECK_DECL([optreset], [gl_replace_getopt=yes], [], -+ [#include ]) -+ fi -+ -+ dnl mingw's getopt (in libmingwex.a) does weird things when the options -+ dnl strings starts with '+' and it's not the first call. Some internal state -+ dnl is left over from earlier calls, and neither setting optind = 0 nor -+ dnl setting optreset = 1 get rid of this internal state. -+ if test -z "$gl_replace_getopt"; then -+ AC_CACHE_CHECK([whether getopt is POSIX compatible], -+ [gl_cv_func_getopt_posix], -+ [ -+ dnl This test fails on mingw and succeeds on all other platforms. -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include -+#include -+#include -+ -+/* The glibc implementation of getopt supports setting optind = 0 as a means -+ of clearing the internal state, but other implementations don't. */ -+#if (__GLIBC__ >= 2) -+# define OPTIND_MIN 0 -+#else -+# define OPTIND_MIN 1 -+#endif -+ -+int -+main () -+{ -+ { -+ int argc = 0; -+ char *argv[10]; -+ int c; -+ -+ argv[argc++] = "program"; -+ argv[argc++] = "-a"; -+ argv[argc++] = "foo"; -+ argv[argc++] = "bar"; -+ optind = OPTIND_MIN; -+ opterr = 0; -+ -+ c = getopt (argc, argv, "ab"); -+ if (!(c == 'a')) -+ return 1; -+ c = getopt (argc, argv, "ab"); -+ if (!(c == -1)) -+ return 2; -+ if (!(optind == 2)) -+ return 3; -+ } -+ /* Some internal state exists at this point. */ -+ { -+ int argc = 0; -+ char *argv[10]; -+ int c; -+ -+ argv[argc++] = "program"; -+ argv[argc++] = "donald"; -+ argv[argc++] = "-p"; -+ argv[argc++] = "billy"; -+ argv[argc++] = "duck"; -+ argv[argc++] = "-a"; -+ argv[argc++] = "bar"; -+ optind = OPTIND_MIN; -+ opterr = 0; -+ -+ c = getopt (argc, argv, "+abp:q:"); -+ if (!(c == -1)) -+ return 4; -+ if (!(strcmp (argv[0], "program") == 0)) -+ return 5; -+ if (!(strcmp (argv[1], "donald") == 0)) -+ return 6; -+ if (!(strcmp (argv[2], "-p") == 0)) -+ return 7; -+ if (!(strcmp (argv[3], "billy") == 0)) -+ return 8; -+ if (!(strcmp (argv[4], "duck") == 0)) -+ return 9; -+ if (!(strcmp (argv[5], "-a") == 0)) -+ return 10; -+ if (!(strcmp (argv[6], "bar") == 0)) -+ return 11; -+ if (!(optind == 1)) -+ return 12; -+ } -+ -+ return 0; -+} -+]])], -+ [gl_cv_func_getopt_posix=yes], [gl_cv_func_getopt_posix=no], -+ [case "$host_os" in -+ mingw*) gl_cv_func_getopt_posix="guessing no";; -+ *) gl_cv_func_getopt_posix="guessing yes";; -+ esac -+ ]) -+ ]) -+ case "$gl_cv_func_getopt_posix" in -+ *no) gl_replace_getopt=yes ;; -+ esac -+ fi -+ -+ if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then -+ AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_getopt_gnu], -+ [AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM([[#include -+ #include -+ #include ]], -+ [[ -+ /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, -+ and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, -+ OSF/1 5.1, Solaris 10. */ -+ { -+ char *myargv[3]; -+ myargv[0] = "conftest"; -+ myargv[1] = "-+"; -+ myargv[2] = 0; -+ opterr = 0; -+ if (getopt (2, myargv, "+a") != '?') -+ return 1; -+ } -+ /* This code succeeds on glibc 2.8, mingw, -+ and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, -+ IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin. */ -+ { -+ char *argv[] = { "program", "-p", "foo", "bar" }; -+ -+ optind = 1; -+ if (getopt (4, argv, "p::") != 'p') -+ return 2; -+ if (optarg != NULL) -+ return 3; -+ if (getopt (4, argv, "p::") != -1) -+ return 4; -+ if (optind != 2) -+ return 5; -+ } -+ return 0; -+ ]])], -+ [gl_cv_func_getopt_gnu=yes], -+ [gl_cv_func_getopt_gnu=no], -+ [dnl Cross compiling. Guess based on host and declarations. -+ case "$host_os" in -+ *-gnu* | mingw*) gl_cv_func_getopt_gnu=no;; -+ *) gl_cv_func_getopt_gnu=yes;; -+ esac -+ ]) -+ ]) -+ if test "$gl_cv_func_getopt_gnu" = "no"; then -+ gl_replace_getopt=yes -+ fi -+ fi -+]) -+ -+# emacs' configure.in uses this. -+AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], -+[ -+ GETOPT_H=getopt.h -+ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], -+ [Define to rpl_ if the getopt replacement functions and variables -+ should be used.]) -+ AC_SUBST([GETOPT_H]) -+]) -+ -+# Prerequisites of lib/getopt*. -+# emacs' configure.in uses this. -+AC_DEFUN([gl_PREREQ_GETOPT], -+[ -+ AC_CHECK_DECLS_ONCE([getenv]) -+]) -diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4 -new file mode 100644 -index 0000000..56a554b ---- /dev/null -+++ b/gnulib/m4/gnulib-cache.m4 -@@ -0,0 +1,36 @@ -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# -+# This file represents the specification of how gnulib-tool is used. -+# It acts as a cache: It is written and read by gnulib-tool. -+# In projects using CVS, this file is meant to be stored in CVS, -+# like the configure.ac and various Makefile.am files. -+ -+ -+# Specification in the form of a command-line invocation: -+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl --no-vc-files getopt-gnu -+ -+# Specification in the form of a few gnulib-tool.m4 macro invocations: -+gl_LOCAL_DIR([]) -+gl_MODULES([ -+ getopt-gnu -+]) -+gl_AVOID([]) -+gl_SOURCE_BASE([gnulib]) -+gl_M4_BASE([gnulib/m4]) -+gl_PO_BASE([]) -+gl_DOC_BASE([doc]) -+gl_TESTS_BASE([tests]) -+gl_LIB([libgnu]) -+gl_MAKEFILE_NAME([]) -+gl_LIBTOOL -+gl_MACRO_PREFIX([gl]) -+gl_PO_DOMAIN([]) -+gl_VC_FILES([false]) -diff --git a/gnulib/m4/gnulib-common.m4 b/gnulib/m4/gnulib-common.m4 -new file mode 100644 -index 0000000..c8fda20 ---- /dev/null -+++ b/gnulib/m4/gnulib-common.m4 -@@ -0,0 +1,124 @@ -+# gnulib-common.m4 serial 11 -+dnl Copyright (C) 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. -+ -+# gl_COMMON -+# is expanded unconditionally through gnulib-tool magic. -+AC_DEFUN([gl_COMMON], [ -+ dnl Use AC_REQUIRE here, so that the code is expanded once only. -+ AC_REQUIRE([gl_00GNULIB]) -+ AC_REQUIRE([gl_COMMON_BODY]) -+]) -+AC_DEFUN([gl_COMMON_BODY], [ -+ AH_VERBATIM([isoc99_inline], -+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports -+ the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of -+ earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. -+ __APPLE__ && __MACH__ test for MacOS X. -+ __APPLE_CC__ tests for the Apple compiler and its version. -+ __STDC_VERSION__ tests for the C99 mode. */ -+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ -+# define __GNUC_STDC_INLINE__ 1 -+#endif]) -+ AH_VERBATIM([unused_parameter], -+[/* Define as a marker that can be attached to function parameter declarations -+ for parameters that are not used. This helps to reduce warnings, such as -+ from GCC -Wunused-parameter. */ -+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) -+# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) -+#else -+# define _UNUSED_PARAMETER_ -+#endif -+]) -+]) -+ -+# gl_MODULE_INDICATOR([modulename]) -+# defines a C macro indicating the presence of the given module. -+AC_DEFUN([gl_MODULE_INDICATOR], -+[ -+ AC_DEFINE([GNULIB_]translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], -+ [Define to 1 when using the gnulib module ]$1[.]) -+]) -+ -+# m4_foreach_w -+# is a backport of autoconf-2.59c's m4_foreach_w. -+# Remove this macro when we can assume autoconf >= 2.60. -+m4_ifndef([m4_foreach_w], -+ [m4_define([m4_foreach_w], -+ [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) -+ -+# AC_PROG_MKDIR_P -+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P. -+# Remove this macro when we can assume autoconf >= 2.60. -+m4_ifdef([AC_PROG_MKDIR_P], [], [ -+ AC_DEFUN_ONCE([AC_PROG_MKDIR_P], -+ [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake -+ MKDIR_P='$(mkdir_p)' -+ AC_SUBST([MKDIR_P])])]) -+ -+# AC_C_RESTRICT -+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, -+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ -+# works. -+# This definition can be removed once autoconf >= 2.62 can be assumed. -+AC_DEFUN([AC_C_RESTRICT], -+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], -+ [ac_cv_c_restrict=no -+ # The order here caters to the fact that C++ does not require restrict. -+ for ac_kw in __restrict __restrict__ _Restrict restrict; do -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -+ [[typedef int * int_ptr; -+ int foo (int_ptr $ac_kw ip) { -+ return ip[0]; -+ }]], -+ [[int s[1]; -+ int * $ac_kw t = s; -+ t[0] = 0; -+ return foo(t)]])], -+ [ac_cv_c_restrict=$ac_kw]) -+ test "$ac_cv_c_restrict" != no && break -+ done -+ ]) -+ AH_VERBATIM([restrict], -+[/* Define to the equivalent of the C99 'restrict' keyword, or to -+ nothing if this is not supported. Do not define if restrict is -+ supported directly. */ -+#undef restrict -+/* Work around a bug in Sun C++: it does not support _Restrict, even -+ though the corresponding Sun C compiler does, which causes -+ "#define restrict _Restrict" in the previous line. Perhaps some future -+ version of Sun C++ will work with _Restrict; if so, it'll probably -+ define __RESTRICT, just as Sun C does. */ -+#if defined __SUNPRO_CC && !defined __RESTRICT -+# define _Restrict -+#endif]) -+ case $ac_cv_c_restrict in -+ restrict) ;; -+ no) AC_DEFINE([restrict], []) ;; -+ *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; -+ esac -+]) -+ -+# gl_BIGENDIAN -+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. -+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some -+# macros invoke AC_C_BIGENDIAN with arguments. -+AC_DEFUN([gl_BIGENDIAN], -+[ -+ AC_C_BIGENDIAN -+]) -+ -+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) -+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not -+# output a spurious "(cached)" mark in the midst of other configure output. -+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded -+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair. -+AC_DEFUN([gl_CACHE_VAL_SILENT], -+[ -+ saved_as_echo_n="$as_echo_n" -+ as_echo_n=':' -+ AC_CACHE_VAL([$1], [$2]) -+ as_echo_n="$saved_as_echo_n" -+]) -diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 -new file mode 100644 -index 0000000..6514552 ---- /dev/null -+++ b/gnulib/m4/gnulib-comp.m4 -@@ -0,0 +1,197 @@ -+# DO NOT EDIT! GENERATED AUTOMATICALLY! -+# Copyright (C) 2002-2009 Free Software Foundation, Inc. -+# -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. -+# -+# Generated by gnulib-tool. -+# -+# This file represents the compiled summary of the specification in -+# gnulib-cache.m4. It lists the computed macro invocations that need -+# to be invoked from configure.ac. -+# In projects using CVS, this file can be treated like other built files. -+ -+ -+# This macro should be invoked from ./configure.in, in the section -+# "Checks for programs", right after AC_PROG_CC, and certainly before -+# any checks for libraries, header files, types and library functions. -+AC_DEFUN([gl_EARLY], -+[ -+ m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace -+ m4_pattern_allow([^gl_ES$])dnl a valid locale name -+ m4_pattern_allow([^gl_LIBOBJS$])dnl a variable -+ m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable -+ AC_REQUIRE([AC_PROG_RANLIB]) -+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) -+]) -+ -+# This macro should be invoked from ./configure.in, in the section -+# "Check for header files, types and library functions". -+AC_DEFUN([gl_INIT], -+[ -+ AM_CONDITIONAL([GL_COND_LIBTOOL], [true]) -+ gl_cond_libtool=true -+ m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) -+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) -+ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) -+ m4_pushdef([gl_LIBSOURCES_LIST], []) -+ m4_pushdef([gl_LIBSOURCES_DIR], []) -+ gl_COMMON -+ gl_source_base='gnulib' -+ gl_FUNC_GETOPT_GNU -+ gl_MODULE_INDICATOR([getopt-gnu]) -+ gl_FUNC_GETOPT_POSIX -+ AC_SUBST([LIBINTL]) -+ AC_SUBST([LTLIBINTL]) -+ gl_STDDEF_H -+ gl_UNISTD_H -+ m4_ifval(gl_LIBSOURCES_LIST, [ -+ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || -+ for gl_file in ]gl_LIBSOURCES_LIST[ ; do -+ if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then -+ echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 -+ exit 1 -+ fi -+ done])dnl -+ m4_if(m4_sysval, [0], [], -+ [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) -+ ]) -+ m4_popdef([gl_LIBSOURCES_DIR]) -+ m4_popdef([gl_LIBSOURCES_LIST]) -+ m4_popdef([AC_LIBSOURCES]) -+ m4_popdef([AC_REPLACE_FUNCS]) -+ m4_popdef([AC_LIBOBJ]) -+ AC_CONFIG_COMMANDS_PRE([ -+ gl_libobjs= -+ gl_ltlibobjs= -+ if test -n "$gl_LIBOBJS"; then -+ # Remove the extension. -+ sed_drop_objext='s/\.o$//;s/\.obj$//' -+ for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do -+ gl_libobjs="$gl_libobjs $i.$ac_objext" -+ gl_ltlibobjs="$gl_ltlibobjs $i.lo" -+ done -+ fi -+ AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) -+ AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) -+ ]) -+ gltests_libdeps= -+ gltests_ltlibdeps= -+ m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) -+ m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Jun 17 11:18:18 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 17 Jun 2013 09:18:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21352] csw/mgar/pkg/gnuplot/trunk Message-ID: Revision: 21352 http://gar.svn.sourceforge.net/gar/?rev=21352&view=rev Author: lblume Date: 2013-06-17 09:18:17 +0000 (Mon, 17 Jun 2013) Log Message: ----------- gnuplot/trunk: bump to 4.6.3; change wxwidget dependencies; clean up useless dependencies thanks to -z ignore Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile csw/mgar/pkg/gnuplot/trunk/checksums Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2013-06-17 09:15:33 UTC (rev 21351) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2013-06-17 09:18:17 UTC (rev 21352) @@ -1,5 +1,5 @@ NAME = gnuplot -VERSION = 4.6.1 +VERSION = 4.6.3 DESCRIPTION = The Gnuplot Plotting Utility @@ -15,19 +15,11 @@ PACKAGES += CSWgnuplot CATALOGNAME_CSWgnuplot = gnuplot SPKG_DESC_CSWgnuplot = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibgd2 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibxpm4 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWgnuplot += CSWliblua5-2 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng15-15 # There is just an emacs style in it, do not depend on it CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon @@ -36,34 +28,18 @@ CATALOGNAME_CSWgnuplot-wx = gnuplot_wx SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango) RUNTIME_DEP_PKGS_CSWgnuplot-wx = CSWgnuplot -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgd2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibxpm4 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWliblua5-2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWsunmath -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpdf6 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2 # This is pulled in from Wx, take out if that has been redone CHECKPKG_OVERRIDES_CSWgnuplot-wx += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/gnuplot/4.6/gnuplot_x11-wx @@ -73,7 +49,7 @@ REINPLACE_USRLOCAL += share/gnuplotrc -EXTRA_LINKER_FLAGS += -norunpath +EXTRA_LINKER_FLAGS += -norunpath -z ignore # Gnuplot automatically pulls in libCstd which is needed by libwx_gtk2u_core-2.8.so.0.6.0 because # the library is wrong self-contained (ldd -r on that throws unresolved symbol errors). @@ -133,11 +109,6 @@ CHECKPKG_OVERRIDES_CSWgnuplot += surplus-dependency|CSWalternatives CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives -# These are just examples -CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-nowx -CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-wx -CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnuplot.info - # Is this GDFONTPATH related? That would be bad... CHECK!!! #CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-nowx #CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/bin/gnuplot-wx Modified: csw/mgar/pkg/gnuplot/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuplot/trunk/checksums 2013-06-17 09:15:33 UTC (rev 21351) +++ csw/mgar/pkg/gnuplot/trunk/checksums 2013-06-17 09:18:17 UTC (rev 21352) @@ -1 +1 @@ -4c9a06461f402482c30cf94e267eb877 gnuplot-4.6.1.tar.gz +db7a73d2dddec0149dcec35e30561aa3 gnuplot-4.6.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Mon Jun 17 13:21:13 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Mon, 17 Jun 2013 11:21:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[21353] csw/mgar/pkg/gd/branches Message-ID: Revision: 21353 http://gar.svn.sourceforge.net/gar/?rev=21353&view=rev Author: mattdarcy Date: 2013-06-17 11:21:10 +0000 (Mon, 17 Jun 2013) Log Message: ----------- BTS test branch for recipe testing - please ignore temporary only Modified Paths: -------------- csw/mgar/pkg/gd/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/gd/branches/nim/ Modified: csw/mgar/pkg/gd/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/gd/branches/nim/Makefile 2013-06-17 11:21:10 UTC (rev 21353) @@ -19,36 +19,36 @@ PATCHFILES += gdkanji.c.patch -PACKAGES = CSWgd -CATALOGNAME_CSWgd = gd -SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation +PACKAGES = NIMOSSgd +CATALOGNAME_NIMOSSgd = gd +SPKG_DESC_NIMOSSgd = Utilities facilitating libgd for dynamic image creation # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2 +RUNTIME_DEP_PKGS_NIMOSSgd += NIMOSSlibgd2 -PACKAGES += CSWlibgd2 -CATALOGNAME_CSWlibgd2 = libgd2 -SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2 -PKGFILES_CSWlibgd2 += $(call pkgfiles_lib,libgd.so.2) -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibpng15-15 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibxpm4 -RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibz1 +PACKAGES += NIMOSSlibgd2 +CATALOGNAME_NIMOSSlibgd2 = libgd2 +SPKG_DESC_NIMOSSlibgd2 = A library used for dynamic image creation providing libgd.so.2 +PKGFILES_NIMOSSlibgd2 += $(call pkgfiles_lib,libgd.so.2) +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfontconfig1 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfreetype6 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibiconv2 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibjpeg7 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibpng15-15 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibxpm4 +RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibz1 -PACKAGES += CSWlibgd-dev -CATALOGNAME_CSWlibgd-dev = libgd_dev -SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.2 -PKGFILES_CSWlibgd-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2 +PACKAGES += NIMOSSlibgd-dev +CATALOGNAME_NIMOSSlibgd-dev = libgd_dev +SPKG_DESC_NIMOSSlibgd-dev = Development files for libgd.so.2 +PKGFILES_NIMOSSlibgd-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_NIMOSSlibgd-dev = NIMOSSlibgd2 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype +NIMOSS_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype # This is evaluated twice, quote properly -EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\" +EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(NIMOSS_DEFAULT_FONTPATH)\\\" BUILD64_LIBS_ONLY = 1 STRIP_LIBTOOL = 1 @@ -66,17 +66,17 @@ TEST_SCRIPTS = # This is ok as there are a number of search pathes for fonts in there. -# We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list. -CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h +# We made sure that the $NIMOSS_DEFAULT_FONTPATH is the first one in the list. +CHECKPKG_OVERRIDES_NIMOSSlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h include gar/category.mk # Make sure GDFONTPATH is set correctly post-extract-modulated: - perl -pi -e 's,/usr/share/fonts/truetype,$(CSW_DEFAULT_FONTPATH),' \ + perl -pi -e 's,/usr/share/fonts/truetype,$(NIMOSS_DEFAULT_FONTPATH),' \ $(WORKSRC)/gdtestft.c \ $(WORKSRC)/annotate.c - perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(CSW_DEFAULT_FONTPATH):,' \ + perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(NIMOSS_DEFAULT_FONTPATH):,' \ $(WORKSRC)/gd.h @$(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 Mon Jun 17 13:23:06 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 17 Jun 2013 11:23:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[21354] csw/mgar/pkg/gnuplot/trunk/Makefile Message-ID: Revision: 21354 http://gar.svn.sourceforge.net/gar/?rev=21354&view=rev Author: lblume Date: 2013-06-17 11:23:05 +0000 (Mon, 17 Jun 2013) Log Message: ----------- gnuplot/trunk: New name for the emacs dependency Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2013-06-17 11:21:10 UTC (rev 21353) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2013-06-17 11:23:05 UTC (rev 21354) @@ -22,7 +22,7 @@ RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpdf6 # There is just an emacs style in it, do not depend on it -CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWgnuplot += missing-dependency|CSWemacs-common PACKAGES += CSWgnuplot-wx CATALOGNAME_CSWgnuplot-wx = gnuplot_wx 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 Jun 17 13:29:33 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 17 Jun 2013 11:29:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[21355] csw/mgar/pkg/rapidsvn/trunk Message-ID: Revision: 21355 http://gar.svn.sourceforge.net/gar/?rev=21355&view=rev Author: dmichelsen Date: 2013-06-17 11:29:33 +0000 (Mon, 17 Jun 2013) Log Message: ----------- rapidsvn/trunk: Update to 0.12.1, split packages Modified Paths: -------------- csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/checksums Added Paths: ----------- csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch Removed Paths: ------------- csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2013-06-17 11:23:05 UTC (rev 21354) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2013-06-17 11:29:33 UTC (rev 21355) @@ -1,6 +1,5 @@ NAME = rapidsvn -VERSION = 0.12.0-1 -SPKG_VERSION = $(subst -,.,$(VERSION)) +VERSION = 0.12.1 GARTYPE = v2 DESCRIPTION = GUI front-end for the Subversion revision system @@ -11,70 +10,64 @@ are working on the Documentation and Online Help of RapidSVN endef -MASTER_SITES = http://www.rapidsvn.org/download/release/0.12/ +MASTER_SITES = http://www.rapidsvn.org/download/release/0.12.1/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) -# DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) -PATCHFILES = 0001-Use-explicit-constructor-for-wxString.patch -PATCHFILES += 0002-Make-sure-to-pass-norunpath-through-libtool.patch +PATCHFILES += 0001-Use-explicit-constructor-for-wxString.patch +PATCHFILES += 0001-Do-not-strip-norunpath-on-libtool.patch +PATCHFILES += 0001-Add-missing-svncpp.dox-not-in-tarball.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWrapidsvn CSWlibsvncpp3 +VENDOR_URL = http://rapidsvn.tigris.org/ -CATALOGNAME_CSWrapidsvn = rapidsvn -CATALOGNAME_CSWlibsvncpp3 = libsvncpp3 +BUILD_DEP_PKGS += CSWsvn-dev +BUILD_DEP_PKGS += CSWapache2-dev +BUILD_DEP_PKGS += CSWdocbookxsl +PACKAGES += CSWrapidsvn SPKG_DESC_CSWrapidsvn = $(DESCRIPTION) -SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding - -SPKG_SOURCEURL = http://rapidsvn.tigris.org/ - -BUILD_DEP_PKGS = CSWsvn-devel CSWapache2-devel - -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWoldaprt -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2 -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWexpat -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWbdb48 -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWncurses -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr-util -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsunmath -RUNTIME_DEP_PKGS_CSWrapidsvn += CSWiconv +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgets +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibsvncpp3 RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsvn +RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2 -BUILD_DEP_PKGS += CSWdocbookxsl +PACKAGES += CSWlibsvncpp3 +SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding +PKGFILES_CSWlibsvncpp3 += $(call pkgfiles_lib,libsvncpp.so.3) + +PACKAGES += CSWlibsvncpp-dev +SPKG_DESC_CSWlibsvncpp-dev = Development files for libsvncpp.so.3 +PKGFILES_CSWlibsvncpp-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsvncpp-dev += CSWlibsvncpp3 + DOCBOOK_MANPAGE = $(sharedstatedir)/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl APR_CONFIG = $(bindir)/apr-1-config APU_CONFIG = $(bindir)/apu-1-config SVNLIBDIR = $(libdir)/svn +EXTRA_LINKER_FLAGS += -norunpath + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG) CONFIGURE_ARGS += --with-apu-config=$(APU_CONFIG) CONFIGURE_ARGS += --with-svn-lib=$(SVNLIBDIR) CONFIGURE_ARGS += --with-svn-include=$(includedir) CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE) +CONFIGURE_ARGS += --with-manpage=yes # This must match the apr bdb binding. We need this to make sure # libdb.so is found at the correct place. EXTRA_LIB = $(SVNLIBDIR) $(prefix)/bdb48/lib -PKGFILES_CSWlibsvncpp3 = $(PKGFILES_RT) -PKGFILES_CSWlibsvncpp3 += $(PKGFILES_DEVEL) - -# We don't have a devel package -CHECKPKG_OVERRIDES_CSWlibsvncpp3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsvncpp.so - include gar/category.mk -post-install-modulated: - ginstall -d $(DESTDIR)$(mandir)/man1 - ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 - @$(MAKECOOKIE) +#post-install-modulated: +# ginstall -d $(DESTDIR)$(mandir)/man1 +# ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1 +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/rapidsvn/trunk/checksums =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/checksums 2013-06-17 11:23:05 UTC (rev 21354) +++ csw/mgar/pkg/rapidsvn/trunk/checksums 2013-06-17 11:29:33 UTC (rev 21355) @@ -1 +1 @@ -8ec54104fca32d81e396a68e25324263 rapidsvn-0.12.0-1.tar.gz +8de3ca6da3ef6a27d59f959d1bbcd96b rapidsvn-0.12.1.tar.gz Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch (rev 0) +++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch 2013-06-17 11:29:33 UTC (rev 21355) @@ -0,0 +1,202 @@ +From 63cd5923fb6ec46ec7b1415a22cf0540518b5bcb Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 17 Jun 2013 11:04:48 +0200 +Subject: [PATCH] Add missing svncpp.dox not in tarball + +--- + doc/svncpp/svncpp.dox | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 183 insertions(+) + create mode 100644 doc/svncpp/svncpp.dox + +diff --git a/doc/svncpp/svncpp.dox b/doc/svncpp/svncpp.dox +new file mode 100644 +index 0000000..b60e62b +--- /dev/null ++++ b/doc/svncpp/svncpp.dox +@@ -0,0 +1,183 @@ ++# Doxyfile for SvnCpp ++# To build this documentation download Doxygen http://www.doxygen.org/ ++ ++#--------------------------------------------------------------------------- ++# General configuration options ++#--------------------------------------------------------------------------- ++PROJECT_NAME = SvnCpp ++PROJECT_NUMBER = ++OUTPUT_DIRECTORY = . ++OUTPUT_LANGUAGE = English ++EXTRACT_ALL = YES ++EXTRACT_PRIVATE = NO ++EXTRACT_STATIC = NO ++EXTRACT_LOCAL_CLASSES = YES ++HIDE_UNDOC_MEMBERS = NO ++HIDE_UNDOC_CLASSES = NO ++BRIEF_MEMBER_DESC = YES ++REPEAT_BRIEF = YES ++ALWAYS_DETAILED_SEC = NO ++INLINE_INHERITED_MEMB = NO ++FULL_PATH_NAMES = NO ++STRIP_FROM_PATH = ++INTERNAL_DOCS = NO ++STRIP_CODE_COMMENTS = YES ++CASE_SENSE_NAMES = YES ++SHORT_NAMES = NO ++HIDE_SCOPE_NAMES = NO ++VERBATIM_HEADERS = YES ++SHOW_INCLUDE_FILES = YES ++JAVADOC_AUTOBRIEF = NO ++MULTILINE_CPP_IS_BRIEF = NO ++DETAILS_AT_TOP = NO ++INHERIT_DOCS = YES ++INLINE_INFO = YES ++SORT_MEMBER_DOCS = YES ++DISTRIBUTE_GROUP_DOC = NO ++TAB_SIZE = 8 ++GENERATE_TODOLIST = YES ++GENERATE_TESTLIST = YES ++GENERATE_BUGLIST = YES ++ALIASES = ++ENABLED_SECTIONS = ++MAX_INITIALIZER_LINES = 30 ++OPTIMIZE_OUTPUT_FOR_C = YES ++OPTIMIZE_OUTPUT_JAVA = NO ++SHOW_USED_FILES = YES ++#--------------------------------------------------------------------------- ++# configuration options related to warning and progress messages ++#--------------------------------------------------------------------------- ++QUIET = NO ++WARNINGS = YES ++WARN_IF_UNDOCUMENTED = NO ++WARN_FORMAT = "$file:$line: $text" ++WARN_LOGFILE = ++#--------------------------------------------------------------------------- ++# configuration options related to the input files ++#--------------------------------------------------------------------------- ++INPUT = ../../include/svncpp ++FILE_PATTERNS = *.hpp ++RECURSIVE = NO ++EXCLUDE = ++EXCLUDE_SYMLINKS = NO ++EXCLUDE_PATTERNS = ++EXAMPLE_PATH = ++EXAMPLE_PATTERNS = ++EXAMPLE_RECURSIVE = NO ++IMAGE_PATH = ++INPUT_FILTER = ++FILTER_SOURCE_FILES = NO ++#--------------------------------------------------------------------------- ++# configuration options related to source browsing ++#--------------------------------------------------------------------------- ++SOURCE_BROWSER = NO ++INLINE_SOURCES = NO ++REFERENCED_BY_RELATION = YES ++REFERENCES_RELATION = YES ++#--------------------------------------------------------------------------- ++# configuration options related to the alphabetical class index ++#--------------------------------------------------------------------------- ++ALPHABETICAL_INDEX = NO ++COLS_IN_ALPHA_INDEX = 5 ++IGNORE_PREFIX = ++#--------------------------------------------------------------------------- ++# configuration options related to the HTML output ++#--------------------------------------------------------------------------- ++GENERATE_HTML = YES ++HTML_OUTPUT = html ++HTML_FILE_EXTENSION = .html ++HTML_HEADER = ++HTML_FOOTER = ++HTML_STYLESHEET = ++HTML_ALIGN_MEMBERS = YES ++GENERATE_HTMLHELP = YES ++CHM_FILE = svncpp.chm ++HHC_LOCATION = ++GENERATE_CHI = NO ++BINARY_TOC = NO ++TOC_EXPAND = NO ++DISABLE_INDEX = NO ++ENUM_VALUES_PER_LINE = 4 ++GENERATE_TREEVIEW = NO ++TREEVIEW_WIDTH = 250 ++#--------------------------------------------------------------------------- ++# configuration options related to the LaTeX output ++#--------------------------------------------------------------------------- ++GENERATE_LATEX = NO ++LATEX_OUTPUT = latex ++LATEX_CMD_NAME = latex ++MAKEINDEX_CMD_NAME = makeindex ++COMPACT_LATEX = NO ++PAPER_TYPE = a4wide ++EXTRA_PACKAGES = ++LATEX_HEADER = ++PDF_HYPERLINKS = NO ++USE_PDFLATEX = NO ++LATEX_BATCHMODE = NO ++#--------------------------------------------------------------------------- ++# configuration options related to the RTF output ++#--------------------------------------------------------------------------- ++GENERATE_RTF = NO ++RTF_OUTPUT = rtf ++COMPACT_RTF = NO ++RTF_HYPERLINKS = NO ++RTF_STYLESHEET_FILE = ++RTF_EXTENSIONS_FILE = ++#--------------------------------------------------------------------------- ++# configuration options related to the man page output ++#--------------------------------------------------------------------------- ++GENERATE_MAN = NO ++MAN_OUTPUT = man ++MAN_EXTENSION = .3 ++MAN_LINKS = NO ++#--------------------------------------------------------------------------- ++# configuration options related to the XML output ++#--------------------------------------------------------------------------- ++GENERATE_XML = NO ++#--------------------------------------------------------------------------- ++# configuration options for the AutoGen Definitions output ++#--------------------------------------------------------------------------- ++GENERATE_AUTOGEN_DEF = NO ++#--------------------------------------------------------------------------- ++# Configuration options related to the preprocessor ++#--------------------------------------------------------------------------- ++ENABLE_PREPROCESSING = YES ++MACRO_EXPANSION = NO ++EXPAND_ONLY_PREDEF = NO ++SEARCH_INCLUDES = YES ++INCLUDE_PATH = ++INCLUDE_FILE_PATTERNS = ++PREDEFINED = ++EXPAND_AS_DEFINED = ++SKIP_FUNCTION_MACROS = YES ++#--------------------------------------------------------------------------- ++# Configuration::addtions related to external references ++#--------------------------------------------------------------------------- ++TAGFILES = ++GENERATE_TAGFILE = ++ALLEXTERNALS = NO ++EXTERNAL_GROUPS = YES ++PERL_PATH = /usr/bin/perl ++#--------------------------------------------------------------------------- ++# Configuration options related to the dot tool ++#--------------------------------------------------------------------------- ++CLASS_DIAGRAMS = YES ++HIDE_UNDOC_RELATIONS = YES ++HAVE_DOT = YES ++CLASS_GRAPH = NO ++COLLABORATION_GRAPH = NO ++TEMPLATE_RELATIONS = YES ++INCLUDE_GRAPH = NO ++INCLUDED_BY_GRAPH = YES ++GRAPHICAL_HIERARCHY = YES ++DOT_IMAGE_FORMAT = png ++DOT_PATH = ++DOTFILE_DIRS = ++MAX_DOT_GRAPH_WIDTH = 1024 ++MAX_DOT_GRAPH_HEIGHT = 1024 ++GENERATE_LEGEND = NO ++DOT_CLEANUP = YES ++#--------------------------------------------------------------------------- ++# Configuration::addtions related to the search engine ++#--------------------------------------------------------------------------- ++SEARCHENGINE = NO +-- +1.8.1.4 + Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch (rev 0) +++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch 2013-06-17 11:29:33 UTC (rev 21355) @@ -0,0 +1,25 @@ +From f1b39457612f77450c34ebb3f8ff3b1e22cfea6d Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 17 Jun 2013 12:53:52 +0200 +Subject: [PATCH] Do not strip -norunpath on libtool + +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index c2852d8..24983b6 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5853,7 +5853,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.8.1.4 + Deleted: csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch 2013-06-17 11:23:05 UTC (rev 21354) +++ csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch 2013-06-17 11:29:33 UTC (rev 21355) @@ -1,25 +0,0 @@ -From 1b25c39d53c48db42781fad4c4d8762949c91bba Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 20 Oct 2010 14:16:27 +0200 -Subject: [PATCH] Make sure to pass -norunpath through libtool - ---- - ltmain.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ltmain.sh b/ltmain.sh -index b612e9a..d5cf479 100755 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" --- -1.7.3 - 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 Jun 17 14:03:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 17 Jun 2013 12:03:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21356] csw/mgar/pkg/wxwidgets/trunk Message-ID: Revision: 21356 http://gar.svn.sourceforge.net/gar/?rev=21356&view=rev Author: lblume Date: 2013-06-17 12:03:54 +0000 (Mon, 17 Jun 2013) Log Message: ----------- wxwidgets/trunk: Fix building with print support Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-17 11:29:33 UTC (rev 21355) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-17 12:03:54 UTC (rev 21356) @@ -19,6 +19,8 @@ MASTER_SITES = $(SF_MIRRORS) SF_PROJECT = wxwindows +PATCHFILES += 0006-configure-gnome-print-headers.patch + PACKAGES = CSWwxwidgets PACKAGES += CSWwxwidgets-dev PACKAGES += CSWwxwidgetsgtk2 @@ -43,6 +45,7 @@ RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWmesa RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWpango +RUNTIME_DEP_PKGS_CSWwxwidgetsgtk2 += CSWlibgnomeprintui RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgets RUNTIME_DEP_PKGS_CSWwxwidgets-dev += CSWwxwidgetsgtk2 @@ -70,6 +73,7 @@ BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibexpat-dev +BUILD_DEP_PKGS += CSWlibgnomeprintdevel # Easier than defining each individual .so.xxx PKGFILES_CSWwxwidgets = $(libdir).*libwx_base.*\.so\..* @@ -99,8 +103,8 @@ CONFIGURE_ARGS += --with-regex CONFIGURE_ARGS += --with-opengl CONFIGURE_ARGS += --enable-unicode -CONFIGURE_ARGS += --enable-printarch=no -CONFIGURE_ARGS += --with-gnomeprint=no +CONFIGURE_ARGS += --enable-printarch=yes +CONFIGURE_ARGS += --with-gnomeprint=yes # -norunpath is needed for LDFLAGS as CC is used as linker. Not cc, so no # problem with it being a C++compiler parameter Added: csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch (rev 0) +++ csw/mgar/pkg/wxwidgets/trunk/files/0006-configure-gnome-print-headers.patch 2013-06-17 12:03:54 UTC (rev 21356) @@ -0,0 +1,11 @@ +--- a/configure.original Tue Mar 22 12:59:37 2011 ++++ b/configure Mon Jun 17 12:04:00 2013 +@@ -43415,7 +43415,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` ++ pkg_cv_LIBGNOMEPRINTUI_CFLAGS="`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` `$PKG_CONFIG --cflags "libgnomeprint-2.2 >= 2.8" 2>/dev/null`" + else + pkg_failed=yes + fi 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 Jun 17 14:45:05 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 17 Jun 2013 12:45:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[21357] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21357 http://gar.svn.sourceforge.net/gar/?rev=21357&view=rev Author: slowfranklin Date: 2013-06-17 12:45:03 +0000 (Mon, 17 Jun 2013) Log Message: ----------- tracker/trunk: Remove version from dev package Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 12:03:54 UTC (rev 21356) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 12:45:03 UTC (rev 21357) @@ -94,10 +94,10 @@ RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-common -RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-miner0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-extract0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-sparql0-16-0 -RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-common +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-miner0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-extract0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-sparql0-16-0 +RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker-common RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibicui18n51 @@ -144,15 +144,15 @@ PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0) PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*) -PACKAGES += CSWlibtracker0-16-dev -SPKG_DESC_CSWlibtracker0-16-dev += $(DESCRIPTION), development files -PKGFILES_CSWlibtracker0-16-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so) -PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so) -PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so) -PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) -PKGFILES_CSWlibtracker0-16-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) -PKGFILES_CSWlibtracker0-16-dev += $(datadir)/vala/vapi/tracker-.* +PACKAGES += CSWlibtracker-dev +SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) +PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) +PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* # For gettext CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) 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 Jun 17 15:07:40 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 17 Jun 2013 13:07:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[21358] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21358 http://gar.svn.sourceforge.net/gar/?rev=21358&view=rev Author: slowfranklin Date: 2013-06-17 13:07:39 +0000 (Mon, 17 Jun 2013) Log Message: ----------- tracker/trunk: .so files are already picked up by PKGFILES_DEVEL Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 12:45:03 UTC (rev 21357) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 13:07:39 UTC (rev 21358) @@ -147,9 +147,6 @@ PACKAGES += CSWlibtracker-dev SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so) -PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so) -PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so) PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so) PKGFILES_CSWlibtracker-dev += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so) PKGFILES_CSWlibtracker-dev += $(datadir)/vala/vapi/tracker-.* 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 Jun 17 15:26:27 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 17 Jun 2013 13:26:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21359] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21359 http://gar.svn.sourceforge.net/gar/?rev=21359&view=rev Author: lblume Date: 2013-06-17 13:26:26 +0000 (Mon, 17 Jun 2013) Log Message: ----------- wxwidgets/trunk: Add override for gnomeprintui dep Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-17 13:07:39 UTC (rev 21358) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-17 13:26:26 UTC (rev 21359) @@ -118,6 +118,9 @@ CHECKPKG_OVERRIDES_CSWwxwidgets = shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 = shared-lib-pkgname-mismatch +# It is built to use GNOME print, so it must be depending on this somehow +CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui + # Only samples inside code comments, can be safely ignored at this point CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h 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 Jun 17 15:33:32 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Mon, 17 Jun 2013 13:33:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21360] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21360 http://gar.svn.sourceforge.net/gar/?rev=21360&view=rev Author: slowfranklin Date: 2013-06-17 13:33:32 +0000 (Mon, 17 Jun 2013) Log Message: ----------- tracker/trunk: Use pkgfiles_lib for picking up the shared libs Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 13:26:26 UTC (rev 21359) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-17 13:33:32 UTC (rev 21360) @@ -123,26 +123,21 @@ PACKAGES += CSWlibtracker-common SPKG_DESC_CSWlibtracker-common += $(DESCRIPTION), libtracker-common -PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0\.1502\.0) -PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so\.0(\.\d+)*) -PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0\.1502\.0) -PKGFILES_CSWlibtracker-common += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-common.so.0) +PKGFILES_CSWlibtracker-common += $(call pkgfiles_lib,tracker-0.16/libtracker-data.so.0) PACKAGES += CSWlibtracker-extract0-16-0 SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0 -PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0\.1502\.0) -PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-extract0-16-0 += $(call pkgfiles_lib,libtracker-extract-0.16.so.0) PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so) PACKAGES += CSWlibtracker-miner0-16-0 SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0 -PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0\.1502\.0) -PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-miner0-16-0 += $(call pkgfiles_lib,libtracker-miner-0.16.so.0) PACKAGES += CSWlibtracker-sparql0-16-0 SPKG_DESC_CSWlibtracker-sparql0-16-0 += $(DESCRIPTION), libtracker-sparql-0.16.so.0 -PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0) -PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*) +PKGFILES_CSWlibtracker-sparql0-16-0 += $(call pkgfiles_lib,libtracker-sparql-0.16.so.0) PACKAGES += CSWlibtracker-dev SPKG_DESC_CSWlibtracker-dev += $(DESCRIPTION), development files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jun 17 22:43:56 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 17 Jun 2013 20:43:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21361] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 21361 http://gar.svn.sourceforge.net/gar/?rev=21361&view=rev Author: bdwalton Date: 2013-06-17 20:43:55 +0000 (Mon, 17 Jun 2013) Log Message: ----------- apache2/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/checksums Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2013-06-17 13:33:32 UTC (rev 21360) +++ csw/mgar/pkg/apache2/trunk/Makefile 2013-06-17 20:43:55 UTC (rev 21361) @@ -1,7 +1,7 @@ # $Id$ NAME = httpd -VERSION = 2.2.23 +VERSION = 2.2.24 GARTYPE = v2 DESCRIPTION = A high performance HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2013-06-17 13:33:32 UTC (rev 21360) +++ csw/mgar/pkg/apache2/trunk/checksums 2013-06-17 20:43:55 UTC (rev 21361) @@ -1 +1 @@ -77246eaa84a54bb7451f68216333750d httpd-2.2.23.tar.gz +64a3392018ad60583209a16d728180d3 httpd-2.2.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jun 17 23:28:54 2013 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 17 Jun 2013 21:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[21362] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 21362 http://gar.svn.sourceforge.net/gar/?rev=21362&view=rev Author: bdwalton Date: 2013-06-17 21:28:50 +0000 (Mon, 17 Jun 2013) Log Message: ----------- apache2/trunk: handle the post-merge step correctly when ensuring the envvars files live in etc Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2013-06-17 20:43:55 UTC (rev 21361) +++ csw/mgar/pkg/apache2/trunk/Makefile 2013-06-17 21:28:50 UTC (rev 21362) @@ -342,6 +342,6 @@ perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *) @echo Adding link from original envvars location @(cd $(PKGROOT)/$(prefix)/apache2/sbin; \ - ln -s ../etc/envvars envvars ) + [ -L envvars ] || ln -s ../etc/envvars envvars ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 18 08:55:24 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Jun 2013 06:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[21363] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 21363 http://gar.svn.sourceforge.net/gar/?rev=21363&view=rev Author: dmichelsen Date: 2013-06-18 06:55:17 +0000 (Tue, 18 Jun 2013) Log Message: ----------- wireshark/trunk: Update to 1.10.0, enable lua again Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2013-06-17 21:28:50 UTC (rev 21362) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2013-06-18 06:55:17 UTC (rev 21363) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.8.6 +VERSION = 1.10.0 GARTYPE = v2 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer @@ -49,7 +49,7 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0 @@ -58,6 +58,7 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWliblua5-2 # No more library splitting unless absolutely necessary CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink @@ -81,14 +82,13 @@ REINPLACE_WITH_mibs = /opt/csw/share/mibs REINPLACE_FILES_mibs += epan/oids.c -# Do not use LD_OPTIONS as it leads to the new version being built against old -# wireshark private libs -#LD_OPTIONS = -#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - # This is now deprecated in Pango, use workaround until Pango is updated EXTRA_CFLAGS += -DG_CONST_RETURN=const +# Hardcode ipv6 until this is fixed (taken from acinclude.m4): +# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8813 +#EXTRA_CFLAGS += -DINET6 -DSOLARIS8_INET6 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no CONFIGURE_ARGS += --with-ssl=/opt/csw Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2013-06-17 21:28:50 UTC (rev 21362) +++ csw/mgar/pkg/wireshark/trunk/checksums 2013-06-18 06:55:17 UTC (rev 21363) @@ -1 +1 @@ -317361e701936c72f7f18f857059b944 wireshark-1.8.6.tar.bz2 +72e51cd33fd33c7044a41c2ab51ad7af wireshark-1.10.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 Tue Jun 18 10:19:12 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 18 Jun 2013 08:19:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21364] csw/mgar/pkg/bsdiff/trunk/Makefile Message-ID: Revision: 21364 http://gar.svn.sourceforge.net/gar/?rev=21364&view=rev Author: dmichelsen Date: 2013-06-18 08:19:01 +0000 (Tue, 18 Jun 2013) Log Message: ----------- bsdiff/trunk: Enable LD_OPTIONS for direct binding Modified Paths: -------------- csw/mgar/pkg/bsdiff/trunk/Makefile Modified: csw/mgar/pkg/bsdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/bsdiff/trunk/Makefile 2013-06-18 06:55:17 UTC (rev 21363) +++ csw/mgar/pkg/bsdiff/trunk/Makefile 2013-06-18 08:19:01 UTC (rev 21364) @@ -19,6 +19,9 @@ SPKG_DESC_CSWmypkg = Binary diff/patch utility # PKGFILES is catchall +BUILD64 = 1 +ISAEXEC = 1 + EXTRA_CFLAGS += -I. CONFIGURE_SCRIPTS = @@ -29,8 +32,8 @@ include gar/category.mk build-custom: - cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bsdiff bsdiff.c err.c - cd $(WORKSRC) && $(CC) $(CFLAGS) -lbz2 -o bspatch bspatch.c err.c + cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CFLAGS) -lbz2 -o bsdiff bsdiff.c err.c + cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" $(CC) $(CFLAGS) -lbz2 -o bspatch bspatch.c err.c @$(MAKECOOKIE) install-custom: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 18 11:16:25 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 18 Jun 2013 09:16:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21365] csw/mgar/pkg/389-ds-base/trunk Message-ID: Revision: 21365 http://gar.svn.sourceforge.net/gar/?rev=21365&view=rev Author: cgrzemba Date: 2013-06-18 09:16:23 +0000 (Tue, 18 Jun 2013) Log Message: ----------- 389-ds-base/trunk: add fix for ticket 47327 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2013-06-18 08:19:01 UTC (rev 21364) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2013-06-18 09:16:23 UTC (rev 21365) @@ -38,6 +38,7 @@ PATCHFILES += 0010-mntent-config.ac.patch PATCHFILES += 0011-Makefile.am.patch PATCHFILES += 0009-fix-for-550-memberuid-not-created.patch +PATCHFILES += 0012-fix-for-47327.patch BUILD_DEP_PKGS += CSWautoconf Added: csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch (rev 0) +++ csw/mgar/pkg/389-ds-base/trunk/files/0012-fix-for-47327.patch 2013-06-18 09:16:23 UTC (rev 21365) @@ -0,0 +1,56 @@ +--- a/ldap/servers/plugins/replication/windows_protocol_util.c ++++ b/ldap/servers/plugins/replication/windows_protocol_util.c +@@ -3799,8 +3799,7 @@ map_entry_dn_inbound_ext(Slapi_Entry *e, Slapi_DN **dn, const Repl_Agmt *ra, int + windows_private_get_windows_subtree(ra)); + } + } +- new_dn = slapi_sdn_new_dn_byval(new_dn_string); +- PR_smprintf_free(new_dn_string); ++ new_dn = slapi_sdn_new_normdn_passin(new_dn_string); + slapi_ch_free_string(&container_str); + /* Clear any earlier error */ + retval = 0; +@@ -3895,6 +3894,7 @@ is_subject_of_agreement_remote(Slapi_Entry *e, const Repl_Agmt *ra) + int retval = 0; + int is_in_subtree = 0; + const Slapi_DN *agreement_subtree = NULL; ++ const Slapi_DN *sdn; + + /* First test for the sync'ed subtree */ + agreement_subtree = windows_private_get_windows_subtree(ra); +@@ -3902,10 +3902,33 @@ is_subject_of_agreement_remote(Slapi_Entry *e, const Repl_Agmt *ra) + { + goto error; + } +- is_in_subtree = slapi_sdn_scope_test(slapi_entry_get_sdn_const(e), agreement_subtree, LDAP_SCOPE_SUBTREE); ++ sdn = slapi_entry_get_sdn_const(e); ++ is_in_subtree = slapi_sdn_scope_test(sdn, agreement_subtree, LDAP_SCOPE_SUBTREE); + if (is_in_subtree) + { +- retval = 1; ++ Slapi_DN psdn = {0}; ++ Slapi_Entry *pentry = NULL; ++ /* ++ * Check whether the parent of the entry exists or not. ++ * If it does not, treat the entry e is out of scope. ++ * For instance, agreement_subtree is cn=USER, ++ * cn=container,cn=USER, is not synchronized. ++ * If 'e' is uid=test,cn=container,cn=USER,, ++ * the entry is not synchronized, either. We treat ++ * 'e' as out of scope. ++ */ ++ slapi_sdn_get_parent(sdn, &psdn); ++ if (0 == slapi_sdn_compare(&psdn, agreement_subtree)) { ++ retval = 1; ++ } else { ++ /* If parent entry is not local, the entry is out of scope */ ++ int rc = windows_get_local_entry(&psdn, &pentry); ++ if ((0 == rc) && pentry) { ++ retval = 1; ++ slapi_entry_free(pentry); ++ } ++ } ++ slapi_sdn_done(&psdn); + } + error: + return retval; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 18 11:23:23 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 18 Jun 2013 09:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[21366] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 21366 http://gar.svn.sourceforge.net/gar/?rev=21366&view=rev Author: cgrzemba Date: 2013-06-18 09:23:21 +0000 (Tue, 18 Jun 2013) Log Message: ----------- 389-ds-base/trunk: update runtime dependency icu51 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2013-06-18 09:16:23 UTC (rev 21365) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2013-06-18 09:23:21 UTC (rev 21366) @@ -74,8 +74,8 @@ RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc50 -RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n50 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n51 +RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc51 # RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3 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 Jun 18 17:07:44 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 18 Jun 2013 15:07:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21367] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21367 http://gar.svn.sourceforge.net/gar/?rev=21367&view=rev Author: lblume Date: 2013-06-18 15:07:33 +0000 (Tue, 18 Jun 2013) Log Message: ----------- wxwidgets/trunk: Reinstate installation of the contrib bits Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-18 09:23:21 UTC (rev 21366) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-18 15:07:33 UTC (rev 21367) @@ -130,7 +130,17 @@ include gar/category.mk +INSTALL_SCRIPTS = wxwidgets +include gar/category.mk + +# It is necessary to use this as the contrib subdirectory is not installed +# by default +install-wxwidgets: + (cd $(WORKSRC) && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) + (cd $(WORKSRC)/contrib && $(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) install) + @$(MAKECOOKIE) + # Remove Studio-specific arch references post-install-modulated: gsed -i \ 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 Jun 18 21:07:03 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 18 Jun 2013 19:07:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[21368] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21368 http://gar.svn.sourceforge.net/gar/?rev=21368&view=rev Author: lblume Date: 2013-06-18 19:06:57 +0000 (Tue, 18 Jun 2013) Log Message: ----------- wxwidgets/trunk: Add some new overrides just to please checkpkg Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-18 15:07:33 UTC (rev 21367) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-18 19:06:57 UTC (rev 21368) @@ -121,6 +121,10 @@ # It is built to use GNOME print, so it must be depending on this somehow CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui +# Okay, I don't quite understand why checkpkg wants these now... +CHECKPKG_OVERRIDES_CSWwxwidgetscommon += dependency-listed-more-than-once|CSWwxwidgets +CHECKPKG_OVERRIDES_CSWwxwidgetsdevel += dependency-listed-more-than-once|CSWwxwidgets-dev + # Only samples inside code comments, can be safely ignored at this point CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h 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 Jun 18 21:58:25 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 18 Jun 2013 19:58:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21369] csw/mgar/pkg/puppet3/trunk Message-ID: Revision: 21369 http://gar.svn.sourceforge.net/gar/?rev=21369&view=rev Author: phipsy Date: 2013-06-18 19:58:24 +0000 (Tue, 18 Jun 2013) Log Message: ----------- puppet3: version hup to 3.2.2 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-06-18 19:06:57 UTC (rev 21368) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2013-06-18 19:58:24 UTC (rev 21369) @@ -3,7 +3,7 @@ # $Id$ NAME = puppet3 -VERSION = 3.2.1 +VERSION = 3.2.2 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet3/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet3/trunk/checksums 2013-06-18 19:06:57 UTC (rev 21368) +++ csw/mgar/pkg/puppet3/trunk/checksums 2013-06-18 19:58:24 UTC (rev 21369) @@ -2,3 +2,4 @@ 4cbdcc9dfcda677c820175375a500651 puppet-3.1.0.tar.gz e942079612703a460a9fdb52e6bcae4a puppet-3.1.1.tar.gz a9bce4fe7a68aebcb6e97256e7faac5b puppet-3.2.1.tar.gz +318de47ab9e7d41cce98c1cbc5d33cc1 puppet-3.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Tue Jun 18 22:04:50 2013 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Tue, 18 Jun 2013 20:04:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[21370] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 21370 http://gar.svn.sourceforge.net/gar/?rev=21370&view=rev Author: phipsy Date: 2013-06-18 20:04:49 +0000 (Tue, 18 Jun 2013) Log Message: ----------- puppet: version hup to 2.7.22 Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2013-06-18 19:58:24 UTC (rev 21369) +++ csw/mgar/pkg/puppet/trunk/Makefile 2013-06-18 20:04:49 UTC (rev 21370) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.7.21 +VERSION = 2.7.22 GARTYPE = v2 define BLURB Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2013-06-18 19:58:24 UTC (rev 21369) +++ csw/mgar/pkg/puppet/trunk/checksums 2013-06-18 20:04:49 UTC (rev 21370) @@ -18,3 +18,4 @@ ba76fa7831df53db7424a8d523465ef5 puppet-2.7.19.tar.gz 746ebdd7ae734fb54e53bf6167f0928d puppet-2.7.20.tar.gz cfea4e3f8cf268c1340aa5c295b3d7f0 puppet-2.7.21.tar.gz +2fb656ecb5f8c99b25b70cb1438649ab puppet-2.7.22.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 Jun 19 14:17:41 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 19 Jun 2013 12:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[21371] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21371 http://gar.svn.sourceforge.net/gar/?rev=21371&view=rev Author: lblume Date: 2013-06-19 12:17:39 +0000 (Wed, 19 Jun 2013) Log Message: ----------- wxwidgets/trunk: Remove those overrides which truly should not be needed Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-18 20:04:49 UTC (rev 21370) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-19 12:17:39 UTC (rev 21371) @@ -121,10 +121,6 @@ # It is built to use GNOME print, so it must be depending on this somehow CHECKPKG_OVERRIDES_CSWwxwidgetsgtk2 += surplus-dependency|CSWlibgnomeprintui -# Okay, I don't quite understand why checkpkg wants these now... -CHECKPKG_OVERRIDES_CSWwxwidgetscommon += dependency-listed-more-than-once|CSWwxwidgets -CHECKPKG_OVERRIDES_CSWwxwidgetsdevel += dependency-listed-more-than-once|CSWwxwidgets-dev - # Only samples inside code comments, can be safely ignored at this point CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/share|root/opt/csw/include/wx-2.8/wx/utils.h CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/unix/stdpaths.h 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 Jun 20 10:08:15 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 08:08:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[21372] csw/mgar/pkg/wxwidgets/trunk/Makefile Message-ID: Revision: 21372 http://gar.svn.sourceforge.net/gar/?rev=21372&view=rev Author: lblume Date: 2013-06-20 08:08:05 +0000 (Thu, 20 Jun 2013) Log Message: ----------- wxwidgets/trunk: Remove sneaky duplicate line Modified Paths: -------------- csw/mgar/pkg/wxwidgets/trunk/Makefile Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-19 12:17:39 UTC (rev 21371) +++ csw/mgar/pkg/wxwidgets/trunk/Makefile 2013-06-20 08:08:05 UTC (rev 21372) @@ -127,9 +127,6 @@ CHECKPKG_OVERRIDES_CSWwxwidgets-dev += file-with-bad-content|/usr/local|root/opt/csw/include/wx-2.8/wx/generic/helpext.h LICENSE = docs/licence.txt - -include gar/category.mk - INSTALL_SCRIPTS = wxwidgets 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 Thu Jun 20 13:51:25 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 11:51:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21373] csw/mgar/pkg/scummvm/trunk Message-ID: Revision: 21373 http://gar.svn.sourceforge.net/gar/?rev=21373&view=rev Author: lblume Date: 2013-06-20 11:51:20 +0000 (Thu, 20 Jun 2013) Log Message: ----------- scummvm/trunk: Add readme and .desktop file Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/scummvm/trunk/files/README.solaris csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 08:08:05 UTC (rev 21372) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 11:51:20 UTC (rev 21373) @@ -8,7 +8,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += README.solaris scummvm.desktop + RUNTIME_DEP_PKGS_CSWscummvm += CSWlibz1 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibogg0 RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbis0 @@ -59,3 +61,9 @@ # For "install" with GNU syntax PATH := /opt/csw/gnu:$(PATH) + +post-install-modulated: + ginstall -m 0644 $(WORKSRC)/README.solaris \ + $(DESTDIR)$(datadir)/doc/scummvm/ + ginstall -m 0644 $(WORKSRC)/scummvm.desktop \ + $(DESTDIR)$(datadir)/applications/scummvm/ Added: csw/mgar/pkg/scummvm/trunk/files/README.solaris =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/README.solaris (rev 0) +++ csw/mgar/pkg/scummvm/trunk/files/README.solaris 2013-06-20 11:51:20 UTC (rev 21373) @@ -0,0 +1,80 @@ + + ScummVM Solaris & OpenIndiana + ============================= + + Introduction + ------------ + + This package contains 32 & 64 bit binaries built for Solaris 10 and later. + The version adapted to the currently loaded kernel will be automatically + started when running ScummVM. + It was also tested and should work on OpenSolaris-related distros such as + OpenIndiana, Solaris 11. + + Installation + ------------ + + Installation is done as root with the pkgadd command: + # pkgadd -d scummvm-x.y.z-solaris-arch.pkg all + + Or using sudo: + + $ sudo pkgadd -d scummvm-x.y.z-solaris-arch.pkg all + + It will be immediately usable as: + $ /opt/csw/bin/scummvm + + To make it appear in the GNOME menus, please run the following commands, + then log out and back in: + + $ sudo ln -s /opt/csw/share/pixmaps/scummvm.xpm /usr/share/pixmaps/ + $ sudo ln -s PRFXDIR/scummvm/share/scummvm/scummvm.desktop \ + /usr/share/applications/ + + Notes + ----- + + This package is built as part of the OpenCSW project that packages useful + programes for Solaris. Visit them at http://www/opencsw.org/ + All the needed libraries are included as a convenience, as I believe a + games should be as easy to install and run as possible. + + Have fun + -- Laurent ? opencsw.org + + + Remerciements/Thanks + -------------------- + + ? Alexandre et William pour leur aide avec isaexec(3C) + ? Elsa, Katrina, Mariusz, Olga pour les traductions de la description + + Links + ----- + + ScummVM + http://www.scummvm.org/ + + SDL - Simple DirectMedia Layer + http://www.libsdl.org/ + + Ogg Vorbis + http://www.vorbis.com/ + + FLAC - Free Lossless Audio Codec + http://flac.sourceforge.net/ + + MAD - MPEG Audio Decoder + http://www.underbit.com/products/mad/ + + GCC + http://gcc.gnu.org/ + + Oracle Solaris + http://www.oracle.com/us/products/servers-storage/solaris/index.html + + OpenIndiana + http://openindiana.org/ + + Oracle Solaris Studio + http://www.oracle.com/us/products/tools/050872.html Added: csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop (rev 0) +++ csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop 2013-06-20 11:51:20 UTC (rev 21373) @@ -0,0 +1,16 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=ScummVM +Exec=scummvm +Icon=scummvm.xpm +Terminal=false +Type=Application +StartupNotify=false +Categories=Application;Game;AdventureGame; +Comment=Allows playing many classic graphical adventure games on modern computers +Comment[da]=Giver lov til at spille mange klassiske eventyr grafikspil paa moderne computer +Comment[de]=Zum spielen viele alter graphischer Adventures auf modernen Rechnern +Comment[es]=Permite jugar una gran variedad de videojuegos cl?sicos de aventura en computadoras modernas +Comment[fr]=Permet de jouer ? des jeux d'aventure graphiques traditionnels sur des ordinateurs modernes +Comment[it]=Permette di giocare una gran variet? di giochi classici di avventura sui computer moderni +Comment[pl]=Pozwala gra? w wiele klasycznych gier przygodowych na nowoczesnych komputerach This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 14:04:52 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 12:04:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21374] csw/mgar/pkg/perl/branches/nim Message-ID: Revision: 21374 http://gar.svn.sourceforge.net/gar/?rev=21374&view=rev Author: mattdarcy Date: 2013-06-20 12:04:47 +0000 (Thu, 20 Jun 2013) Log Message: ----------- testing some recipes Modified Paths: -------------- csw/mgar/pkg/perl/branches/nim/Makefile csw/mgar/pkg/perl/branches/nim/checksums Modified: csw/mgar/pkg/perl/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/perl/branches/nim/Makefile 2013-06-20 11:51:20 UTC (rev 21373) +++ csw/mgar/pkg/perl/branches/nim/Makefile 2013-06-20 12:04:47 UTC (rev 21374) @@ -2,7 +2,7 @@ VERSION = 5.16.2 VERSION_MAJOR = $(shell echo $(VERSION) | cut -f1-2 -d.) #CATEGORIES = lang -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = A high-level, general-purpose programming language define BLURB @@ -24,34 +24,34 @@ PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc #BUILD64_ONLY = 1 -PACKAGES += CSWperl -PKG_DESC_CSWperl = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWperl += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWperl += CSWlibgcc-s1 -#RUNTIME_DEP_PKGS_CSWperl = CSWbdb48 CSWlibgdbm4 -INCOMPATIBLE_PKGS_CSWperl = CSWperlmods CSWpmdigest CSWpmi18nlangtags +PACKAGES += NIMOSSperl +PKG_DESC_NIMOSSperl = $(DESCRIPTION) +RUNTIME_DEP_PKGS_NIMOSSperl += NIMOSSlibssp0 +RUNTIME_DEP_PKGS_NIMOSSperl += NIMOSSlibgcc-s1 +#RUNTIME_DEP_PKGS_NIMOSSperl = NIMOSSbdb48 NIMOSSlibgdbm4 +INCOMPATIBLE_PKGS_NIMOSSperl = NIMOSSperlmods NIMOSSpmdigest NIMOSSpmi18nlangtags -PACKAGES += CSWperldoc -SPKG_DESC_CSWperldoc = Perl documentation -SPKG_DESC_CSWperl = Core Perl distribution -RUNTIME_DEP_PKGS_CSWperldoc = CSWperl -ARCHALL_CSWperldoc = 1 +PACKAGES += NIMOSSperldoc +SPKG_DESC_NIMOSSperldoc = Perl documentation +SPKG_DESC_NIMOSSperl = Core Perl distribution +RUNTIME_DEP_PKGS_NIMOSSperldoc = NIMOSSperl +ARCHALL_NIMOSSperldoc = 1 LICENSE = Copying -CHECKPKG_OVERRIDES_CSWperl += file-with-bad-content -CHECKPKG_OVERRIDES_CSWperldoc += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl -OBSOLETED_BY_CSWperl += CSWpm-module-build -OBSOLETED_BY_CSWperl += CSWpm-json-pp -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-parse-cpan-meta -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-yaml -OBSOLETED_BY_CSWperldoc += CSWpm-module-metadata -CATALOGNAME_CSWpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub -OBSOLETED_BY_CSWperldoc += CSWpm-cpan-meta-requirements -OBSOLETED_BY_CSWperldoc += CSWpm-perl-ostype -CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_NIMOSSperl += file-with-bad-content +CHECKPKG_OVERRIDES_NIMOSSperldoc += file-with-bad-content +#CHECKPKG_OVERRIDES_NIMOSSperldoc += surplus-dependency|NIMOSSperl +OBSOLETED_BY_NIMOSSperl += NIMOSSpm-module-build +OBSOLETED_BY_NIMOSSperl += NIMOSSpm-json-pp +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-cpan-meta +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-parse-cpan-meta +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-cpan-meta-yaml +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-module-metadata +CATALOGNAME_NIMOSSpm-cpan-meta-requirements = pm_cpan_meta_reqs_stub +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-cpan-meta-requirements +OBSOLETED_BY_NIMOSSperldoc += NIMOSSpm-perl-ostype +CHECKPKG_OVERRIDES_NIMOSSperldoc += surplus-dependency|NIMOSSperl @@ -114,7 +114,7 @@ CONFIGURE_ARGS += -Dprefix=$(prefix) CONFIGURE_ARGS += -Dbin=$(bindir) CONFIGURE_ARGS += -Dscriptdir=$(bindir) -# CSW provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) +# NIMOSS provided modules should install in the privlib directory (/opt/csw/share/perl/5.14) CONFIGURE_ARGS += -Dprivlib=$(datadir)/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitearch=/opt/csw/nimoss/local/lib/perl/$(VERSION_MAJOR) CONFIGURE_ARGS += -Dsitelib=/opt/csw/nimoss/local/share/perl/$(VERSION) @@ -168,12 +168,12 @@ #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir) EXTRA_MERGE_EXCLUDE_FILES = .*\/perllocal.pod -PKGFILES_CSWperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* +PKGFILES_NIMOSSperldoc = .*\/pod\/.*\.pod .*\/man\/man.\/.* # The diagnostics.pm module needs the podfile to output its messages. # That means it must be included in the main package, not the docs. -EXTRA_PKGFILES_EXCLUDED_CSWperldoc = .*\/perldiag.pod -EXTRA_PKGFILES_INCLUDED_CSWperl = .*\/perldiag.pod +EXTRA_PKGFILES_EXCLUDED_NIMOSSperldoc = .*\/perldiag.pod +EXTRA_PKGFILES_INCLUDED_NIMOSSperl = .*\/perldiag.pod # Tests take a long time, run once for every release BUILD_SCRIPTS = perl @@ -189,12 +189,12 @@ # This is for the communication with checkpkg. These pathes are searched for modules # when resolving dependencies. -#PROTOTYPE_FILTER_CSWperl = ( cat; echo "i cswperlincpath=CSWperl.cswperlincpath") +#PROTOTYPE_FILTER_NIMOSSperl = ( cat; echo "i cswperlincpath=NIMOSSperl.cswperlincpath") # Splitting of a separate libperl.so requires more work and careful planning. # Override for now. -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so -#CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=CSWperl|expected=CSWlibperl5-16-1 +#CHECKPKG_OVERRIDES_NIMOSSperl += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libperl.so +#CHECKPKG_OVERRIDES_NIMOSSperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.16.1|soname=libperl.so.5.16.1|pkgname=NIMOSSperl|expected=NIMOSSlibperl5-16-1 include gar/category.mk @@ -260,9 +260,9 @@ # " Config.pm Config_heavy.pl ) # @$(MAKECOOKIE) -#POST_TARGETS += CSWperl.cswperlincpath -#CSWperl.cswperlincpath: -# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/CSWperl.cswperlincpath +#POST_TARGETS += NIMOSSperl.cswperlincpath +#NIMOSSperl.cswperlincpath: +# LD_LIBRARY_PATH=$(WORKSRC) $(WORKSRC)/perl -I./lib -e 'print "$$_\n" foreach(@INC)' >$(WORKDIR_GLOBAL)/NIMOSSperl.cswperlincpath # Invoke post-install targets post-install-modulated: $(POST_TARGETS) Modified: csw/mgar/pkg/perl/branches/nim/checksums =================================================================== --- csw/mgar/pkg/perl/branches/nim/checksums 2013-06-20 11:51:20 UTC (rev 21373) +++ csw/mgar/pkg/perl/branches/nim/checksums 2013-06-20 12:04:47 UTC (rev 21374) @@ -1 +1 @@ -b7c7e0b40cb6ac3a73111aa0949b9a51 perl-5.16.2-patched.tar.gz +b9b2fdb957f50ada62d73f43ee75d044 perl-5.10.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 14:10:44 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 12:10:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21375] csw/mgar/pkg/gd/branches/nim/Makefile Message-ID: Revision: 21375 http://gar.svn.sourceforge.net/gar/?rev=21375&view=rev Author: mattdarcy Date: 2013-06-20 12:10:44 +0000 (Thu, 20 Jun 2013) Log Message: ----------- testing 2 patches on the test nim branch, will remove later Modified Paths: -------------- csw/mgar/pkg/gd/branches/nim/Makefile Modified: csw/mgar/pkg/gd/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gd/branches/nim/Makefile 2013-06-20 12:04:47 UTC (rev 21374) +++ csw/mgar/pkg/gd/branches/nim/Makefile 2013-06-20 12:10:44 UTC (rev 21375) @@ -1,6 +1,6 @@ NAME = gd VERSION = 2.0.36RC1 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = A library used for dynamic image creation define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 14:20:25 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 12:20:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21376] csw/mgar/pkg/zip/branches Message-ID: Revision: 21376 http://gar.svn.sourceforge.net/gar/?rev=21376&view=rev Author: mattdarcy Date: 2013-06-20 12:20:25 +0000 (Thu, 20 Jun 2013) Log Message: ----------- zlib test build for nim branch Modified Paths: -------------- csw/mgar/pkg/zip/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/zip/branches/nim/ Modified: csw/mgar/pkg/zip/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/zip/trunk/Makefile 2013-06-03 08:51:06 UTC (rev 21242) +++ csw/mgar/pkg/zip/branches/nim/Makefile 2013-06-20 12:20:25 UTC (rev 21376) @@ -4,7 +4,7 @@ NAME = zip VERSION = 3.0 ZIPVERSION = $(subst .,,$(VERSION)) -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = Info-Zip Zip compression and file packaging/archive utility define BLURB @@ -18,7 +18,7 @@ DISTNAME = $(NAME)$(UNZIPVERSION) DISTFILES = $(DISTNAME).tgz -RUNTIME_DEP_PKGS = CSWlibbz2-1-0 +RUNTIME_DEP_PKGS = NIMOSSlibbz2-1-0 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) # zip's configure is... "special". We use a custom version This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 14:21:48 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 12:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21377] csw/mgar/pkg/zip/branches/nim/Makefile Message-ID: Revision: 21377 http://gar.svn.sourceforge.net/gar/?rev=21377&view=rev Author: mattdarcy Date: 2013-06-20 12:21:48 +0000 (Thu, 20 Jun 2013) Log Message: ----------- removed bzip2 runtime dependency for zlib - seems wrong. Testing Modified Paths: -------------- csw/mgar/pkg/zip/branches/nim/Makefile Modified: csw/mgar/pkg/zip/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/zip/branches/nim/Makefile 2013-06-20 12:20:25 UTC (rev 21376) +++ csw/mgar/pkg/zip/branches/nim/Makefile 2013-06-20 12:21:48 UTC (rev 21377) @@ -18,7 +18,7 @@ DISTNAME = $(NAME)$(UNZIPVERSION) DISTFILES = $(DISTNAME).tgz -RUNTIME_DEP_PKGS = NIMOSSlibbz2-1-0 +#RUNTIME_DEP_PKGS = NIMOSSlibbz2-1-0 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) # zip's configure is... "special". We use a custom version 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 Jun 20 15:21:53 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 13:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21378] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 21378 http://gar.svn.sourceforge.net/gar/?rev=21378&view=rev Author: lblume Date: 2013-06-20 13:21:52 +0000 (Thu, 20 Jun 2013) Log Message: ----------- pgadmin3/trunk: Bump to 1.16.1; adjust for new wxwidget; fix _T() code Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Added 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-06-20 12:21:48 UTC (rev 21377) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2013-06-20 13:21:52 UTC (rev 21378) @@ -3,9 +3,8 @@ # $Id$ NAME = pgadmin3 -VERSION = 1.16.0 +VERSION = 1.16.1 GARTYPE = v2 -GARCOMPILER = SOS12U1 LICENSE = LICENSE PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -20,21 +19,9 @@ DISTFILES += changelog.CSW UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -# Ignore them for now -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_TW/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_CN/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/sl_SI/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/es_ES/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fi_FI/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/de_DE/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/hints/instrumentation.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/extend.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html -CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html +PATCHFILES += 0001-use-wxT.patch -RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetscommon +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgets RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 @@ -43,7 +30,7 @@ BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev BUILD_DEP_PKGS += CSWpostgresql-dev -BUILD_DEP_PKGS += CSWwxwidgetsdevel +BUILD_DEP_PKGS += CSWwxwidgets-dev CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pgsql=$(prefix) Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2013-06-20 12:21:48 UTC (rev 21377) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2013-06-20 13:21:52 UTC (rev 21378) @@ -1 +1 @@ -30ba5470a625176995a21099a9ae3058 pgadmin3-1.16.0.tar.gz +f3bc59630f0dc9600d4ad125097ce2fa pgadmin3-1.16.1.tar.gz Added: csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch (rev 0) +++ csw/mgar/pkg/pgadmin3/trunk/files/0001-use-wxT.patch 2013-06-20 13:21:52 UTC (rev 21378) @@ -0,0 +1,286 @@ +--- 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 mattdarcy at users.sourceforge.net Thu Jun 20 15:27:53 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 13:27:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[21379] csw/mgar/pkg/zlib/branches/nim/Makefile Message-ID: Revision: 21379 http://gar.svn.sourceforge.net/gar/?rev=21379&view=rev Author: mattdarcy Date: 2013-06-20 13:27:53 +0000 (Thu, 20 Jun 2013) Log Message: ----------- added/merged the amd64 build for a test with BTS Modified Paths: -------------- csw/mgar/pkg/zlib/branches/nim/Makefile Modified: csw/mgar/pkg/zlib/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/zlib/branches/nim/Makefile 2013-06-20 13:21:52 UTC (rev 21378) +++ csw/mgar/pkg/zlib/branches/nim/Makefile 2013-06-20 13:27:53 UTC (rev 21379) @@ -2,6 +2,7 @@ NAME = zlib VERSION = 1.2.7 +CATEGORIES = lib GARTYPE = bts DESCRIPTION = Zlib data compression library @@ -19,7 +20,7 @@ MASTER_SITES = http://zlib.net/ MASTER_SITES += $(SF_MIRROR) -SF_PROJECT = libpng +SF_PROJ = libpng DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 15:33:29 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 13:33:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21380] csw/mgar/pkg/libexpat1/branches/nim/Makefile Message-ID: Revision: 21380 http://gar.svn.sourceforge.net/gar/?rev=21380&view=rev Author: mattdarcy Date: 2013-06-20 13:33:28 +0000 (Thu, 20 Jun 2013) Log Message: ----------- fixed BTS build problem with extra libraries, will merge into BTS branch once working properly Modified Paths: -------------- csw/mgar/pkg/libexpat1/branches/nim/Makefile Modified: csw/mgar/pkg/libexpat1/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/libexpat1/branches/nim/Makefile 2013-06-20 13:27:53 UTC (rev 21379) +++ csw/mgar/pkg/libexpat1/branches/nim/Makefile 2013-06-20 13:33:28 UTC (rev 21380) @@ -22,14 +22,14 @@ PACKAGES += NIMOSSlibexpat-dev SPKG_DESC_NIMOSSlibexpat-dev += Development files for libexpat.so.1 PKGFILES_NIMOSSlibexpat-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_NIMOSSlibexpat-dev += CSWlibexpat1 +RUNTIME_DEP_PKGS_NIMOSSlibexpat-dev += NIMOSSlibexpat1 PACKAGES += NIMOSSexpat SPKG_DESC_NIMOSSexpat = XML parser toolkit utility -RUNTIME_DEP_PKGS_NIMOSSexpat += CSWlibexpat1 +RUNTIME_DEP_PKGS_NIMOSSexpat += NIMOSSlibexpat1 # This is for legacy packages depending on NIMOSSexpat to use libexpat.so.0 -RUNTIME_DEP_PKGS_NIMOSSexpat += CSWlibexpat0 -CHECKPKG_OVERRIDES_NIMOSSexpat += surplus-dependency|CSWlibexpat0 +RUNTIME_DEP_PKGS_NIMOSSexpat += NIMOSSlibexpat0 +CHECKPKG_OVERRIDES_NIMOSSexpat += surplus-dependency|NIMOSSlibexpat0 # Testsuite needs __func__ EXTRA_CXXFLAGS = -features=extensions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 16:00:20 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 14:00:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[21381] csw/mgar/pkg/fontconfig/branches Message-ID: Revision: 21381 http://gar.svn.sourceforge.net/gar/?rev=21381&view=rev Author: mattdarcy Date: 2013-06-20 14:00:15 +0000 (Thu, 20 Jun 2013) Log Message: ----------- nim test branch build - checking issues with BTS system Modified Paths: -------------- csw/mgar/pkg/fontconfig/branches/nim/Makefile Added Paths: ----------- csw/mgar/pkg/fontconfig/branches/nim/ Modified: csw/mgar/pkg/fontconfig/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2013-06-20 12:21:48 UTC (rev 21377) +++ csw/mgar/pkg/fontconfig/branches/nim/Makefile 2013-06-20 14:00:15 UTC (rev 21381) @@ -2,7 +2,7 @@ NAME = fontconfig VERSION = 2.10.2 -GARTYPE = v2 +GARTYPE = bts DESCRIPTION = A library for configuring and customizing font access define BLURB @@ -14,35 +14,35 @@ MASTER_SITES = http://www.fontconfig.org/release/ DISTFILES += $(DISTNAME).tar.gz -DISTFILES += CSWfontconfig.postinstall +DISTFILES += NIMOSSfontconfig.postinstall VENDOR_URL = http://www.fontconfig.org -PACKAGES += CSWlibfontconfig1 -PKGFILES_CSWlibfontconfig1 += $(call pkgfiles_lib,libfontconfig.so.1) -SPKG_DESC_CSWlibfontconfig1 += A library for configuring and customizing font access, libfontconfig.so.1 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibexpat1 +PACKAGES += NIMOSSlibfontconfig1 +PKGFILES_NIMOSSlibfontconfig1 += $(call pkgfiles_lib,libfontconfig.so.1) +SPKG_DESC_NIMOSSlibfontconfig1 += A library for configuring and customizing font access, libfontconfig.so.1 +RUNTIME_DEP_PKGS_NIMOSSlibfontconfig1 += NIMOSSlibfreetype6 +RUNTIME_DEP_PKGS_NIMOSSlibfontconfig1 += NIMOSSlibexpat1 -PACKAGES += CSWfontconfig-dev -SPKG_DESC_CSWfontconfig-dev += Development files for libfontconfig.so.1 -PKGFILES_CSWfontconfig-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWfontconfig-dev += CSWlibfontconfig1 -OBSOLETED_BY_CSWfontconfig-dev += CSWfconfig-dev +PACKAGES += NIMOSSfontconfig-dev +SPKG_DESC_NIMOSSfontconfig-dev += Development files for libfontconfig.so.1 +PKGFILES_NIMOSSfontconfig-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_NIMOSSfontconfig-dev += NIMOSSlibfontconfig1 +OBSOLETED_BY_NIMOSSfontconfig-dev += NIMOSSfconfig-dev -PACKAGES += CSWfontconfig -SPKG_DESC_CSWfontconfig = A library for configuring and customizing font access +PACKAGES += NIMOSSfontconfig +SPKG_DESC_NIMOSSfontconfig = A library for configuring and customizing font access # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWfontconfig += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_NIMOSSfontconfig += NIMOSSlibfontconfig1 # This is for /usr/share/fonts which is ok -CHECKPKG_OVERRIDES_CSWfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf +CHECKPKG_OVERRIDES_NIMOSSfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf -OBSOLETED_BY_CSWfontconfig += CSWfconfig -CATALOGNAME_CSWfconfig = fontconfig_stub +OBSOLETED_BY_NIMOSSfontconfig += NIMOSSfconfig +CATALOGNAME_NIMOSSfconfig = fontconfig_stub BUILD64_LIBS_ONLY = 1 -MIGRATE_FILES_CSWfontconfig = fontconfig +MIGRATE_FILES_NIMOSSfontconfig = fontconfig CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 16:02:47 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 14:02:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21382] csw/mgar/pkg/fontconfig/branches/nim/Makefile Message-ID: Revision: 21382 http://gar.svn.sourceforge.net/gar/?rev=21382&view=rev Author: mattdarcy Date: 2013-06-20 14:02:47 +0000 (Thu, 20 Jun 2013) Log Message: ----------- corrected a silly hardcoded file name problem Modified Paths: -------------- csw/mgar/pkg/fontconfig/branches/nim/Makefile Modified: csw/mgar/pkg/fontconfig/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/branches/nim/Makefile 2013-06-20 14:00:15 UTC (rev 21381) +++ csw/mgar/pkg/fontconfig/branches/nim/Makefile 2013-06-20 14:02:47 UTC (rev 21382) @@ -14,7 +14,7 @@ MASTER_SITES = http://www.fontconfig.org/release/ DISTFILES += $(DISTNAME).tar.gz -DISTFILES += NIMOSSfontconfig.postinstall +DISTFILES += CSWfontconfig.postinstall VENDOR_URL = http://www.fontconfig.org This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 16:36:43 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 14:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[21383] csw/mgar/pkg/fontconfig/branches/nim/Makefile Message-ID: Revision: 21383 http://gar.svn.sourceforge.net/gar/?rev=21383&view=rev Author: mattdarcy Date: 2013-06-20 14:36:43 +0000 (Thu, 20 Jun 2013) Log Message: ----------- test to try to fix the libxml2 dependency with bts Modified Paths: -------------- csw/mgar/pkg/fontconfig/branches/nim/Makefile Modified: csw/mgar/pkg/fontconfig/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/branches/nim/Makefile 2013-06-20 14:02:47 UTC (rev 21382) +++ csw/mgar/pkg/fontconfig/branches/nim/Makefile 2013-06-20 14:36:43 UTC (rev 21383) @@ -2,7 +2,7 @@ NAME = fontconfig VERSION = 2.10.2 -GARTYPE = bts +GARTYPE = v2 DESCRIPTION = A library for configuring and customizing font access define BLURB @@ -35,7 +35,7 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_NIMOSSfontconfig += NIMOSSlibfontconfig1 # This is for /usr/share/fonts which is ok -CHECKPKG_OVERRIDES_NIMOSSfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf +CHECKPKG_OVERRIDES_NIMOSSfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/nimoss/fontconfig/fonts.conf OBSOLETED_BY_NIMOSSfontconfig += NIMOSSfconfig CATALOGNAME_NIMOSSfconfig = fontconfig_stub @@ -46,8 +46,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts -CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts -CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig -CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/fontconfig +CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/nimoss/share/fonts +CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/nimoss/cache/fontconfig +CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/nimoss//fontconfig include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From mattdarcy at users.sourceforge.net Thu Jun 20 20:05:19 2013 From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net) Date: Thu, 20 Jun 2013 18:05:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[21384] csw/mgar/pkg/gd/branches/nim/Makefile Message-ID: Revision: 21384 http://gar.svn.sourceforge.net/gar/?rev=21384&view=rev Author: mattdarcy Date: 2013-06-20 18:05:15 +0000 (Thu, 20 Jun 2013) Log Message: ----------- updated to RC version for BTS test Modified Paths: -------------- csw/mgar/pkg/gd/branches/nim/Makefile Modified: csw/mgar/pkg/gd/branches/nim/Makefile =================================================================== --- csw/mgar/pkg/gd/branches/nim/Makefile 2013-06-20 14:36:43 UTC (rev 21383) +++ csw/mgar/pkg/gd/branches/nim/Makefile 2013-06-20 18:05:15 UTC (rev 21384) @@ -67,7 +67,7 @@ # This is ok as there are a number of search pathes for fonts in there. # We made sure that the $NIMOSS_DEFAULT_FONTPATH is the first one in the list. -CHECKPKG_OVERRIDES_NIMOSSlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h +CHECKPKG_OVERRIDES_NIMOSSlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/nimoss/include/gd.h include gar/category.mk @@ -83,7 +83,7 @@ # The shipped libtool doesn't know about Sun Studio C++ compiler 'CC' pre-configure-modulated: # grm -f $(WORKSRC)/config/ltmain.sh -# gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh +# gcp /opt/csw/nimoss/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh # cd $(WORKSRC) && aclocal && automake @$(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 Jun 20 20:47:29 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 18:47:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[21385] csw/mgar/pkg/scummvm/trunk/Makefile Message-ID: Revision: 21385 http://gar.svn.sourceforge.net/gar/?rev=21385&view=rev Author: lblume Date: 2013-06-20 18:47:26 +0000 (Thu, 20 Jun 2013) Log Message: ----------- scummvm/trunk: Fix post-install files copy Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 18:05:15 UTC (rev 21384) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 18:47:26 UTC (rev 21385) @@ -63,7 +63,10 @@ PATH := /opt/csw/gnu:$(PATH) post-install-modulated: - ginstall -m 0644 $(WORKSRC)/README.solaris \ + ginstall -m 0644 $(FILEDIR)/README.solaris \ $(DESTDIR)$(datadir)/doc/scummvm/ - ginstall -m 0644 $(WORKSRC)/scummvm.desktop \ - $(DESTDIR)$(datadir)/applications/scummvm/ + ginstall -m 755 -d $(DESTDIR)$(datadir)/applications + ginstall -m 0644 $(FILEDIR)/scummvm.desktop \ + $(DESTDIR)$(datadir)/applications/ + @$(MAKECOOKIE) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Jun 20 22:02:08 2013 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 20 Jun 2013 22:02:08 +0200 Subject: [csw-devel] Fwd: SF.net SVN: gar:[21385] csw/mgar/pkg/scummvm/trunk/Makefile References: Message-ID: Hi Laurent, Anfang der weitergeleiteten E-Mail: > Von: lblume at users.sourceforge.net > Datum: 20. Juni 2013 20:47:29 MESZ > An: devel at lists.opencsw.org > Betreff: [csw-devel] SF.net SVN: gar:[21385] csw/mgar/pkg/scummvm/trunk/Makefile > Antwort an: Broadcasts commit logs for build descriptions and GAR > > Revision: 21385 > http://gar.svn.sourceforge.net/gar/?rev=21385&view=rev > Author: lblume > Date: 2013-06-20 18:47:26 +0000 (Thu, 20 Jun 2013) > Log Message: > ----------- > scummvm/trunk: Fix post-install files copy > > Modified Paths: > -------------- > csw/mgar/pkg/scummvm/trunk/Makefile > > Modified: csw/mgar/pkg/scummvm/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 18:05:15 UTC (rev 21384) > +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 18:47:26 UTC (rev 21385) > @@ -63,7 +63,10 @@ > PATH := /opt/csw/gnu:$(PATH) > > post-install-modulated: > - ginstall -m 0644 $(WORKSRC)/README.solaris \ > + ginstall -m 0644 $(FILEDIR)/README.solaris \ It is not a good idea to pull from FILEDIR, please use WORKDIR instead, because stuff from DISTFILES is extracted there and it is really important all files are listed in DISTFILES. Best regards -- Dqgo > $(DESTDIR)$(datadir)/doc/scummvm/ > - ginstall -m 0644 $(WORKSRC)/scummvm.desktop \ > - $(DESTDIR)$(datadir)/applications/scummvm/ > + ginstall -m 755 -d $(DESTDIR)$(datadir)/applications > + ginstall -m 0644 $(FILEDIR)/scummvm.desktop \ > + $(DESTDIR)$(datadir)/applications/ > + @$(MAKECOOKIE) > + > > 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 lblume at users.sourceforge.net Thu Jun 20 22:48:58 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 20:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[21386] csw/mgar/pkg/scummvm/trunk/Makefile Message-ID: Revision: 21386 http://gar.svn.sourceforge.net/gar/?rev=21386&view=rev Author: lblume Date: 2013-06-20 20:48:57 +0000 (Thu, 20 Jun 2013) Log Message: ----------- scummvm/trunk: Use the proper PATH variable Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/Makefile Modified: csw/mgar/pkg/scummvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 18:47:26 UTC (rev 21385) +++ csw/mgar/pkg/scummvm/trunk/Makefile 2013-06-20 20:48:57 UTC (rev 21386) @@ -63,10 +63,10 @@ PATH := /opt/csw/gnu:$(PATH) post-install-modulated: - ginstall -m 0644 $(FILEDIR)/README.solaris \ + ginstall -m 0644 $(WORKDIR)/README.solaris \ $(DESTDIR)$(datadir)/doc/scummvm/ ginstall -m 755 -d $(DESTDIR)$(datadir)/applications - ginstall -m 0644 $(FILEDIR)/scummvm.desktop \ + ginstall -m 0644 $(WORKDIR)/scummvm.desktop \ $(DESTDIR)$(datadir)/applications/ @$(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 Jun 20 23:25:56 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Thu, 20 Jun 2013 21:25:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21387] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21387 http://gar.svn.sourceforge.net/gar/?rev=21387&view=rev Author: lblume Date: 2013-06-20 21:25:52 +0000 (Thu, 20 Jun 2013) Log Message: ----------- samba/branches/samba3: Bump to 3.6.16, adjust the recipe for it Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/checksums Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-20 20:48:57 UTC (rev 21386) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-20 21:25:52 UTC (rev 21387) @@ -2,7 +2,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.15 +VERSION = 3.6.16 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -39,6 +39,7 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWsamba +CATALOGNAME_CSWsamba= samba SPKG_DESC_CSWsamba = $(DESCRIPTION) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWsamba += CSWlibpopt0 @@ -57,6 +58,7 @@ RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibtevent0 # Make one unified package for now OBSOLETED_BY_CSWsamba += CSWsambacommon @@ -65,6 +67,7 @@ CATALOGNAME_CSWsambadoc = samba_doc_stub PACKAGES += CSWsamba-client +CATALOGNAME_CSWsambaclient = samba_client_stub SPKG_DESC_CSWsamba-client = Client binaries for samba SMB_CLIENT_TOOLS = rpcclient smbcacls smbclient smbcquotas smbget smbspool smbtar smbtree PKGFILES_CSWsamba-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1) @@ -83,14 +86,15 @@ RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtevent0 OBSOLETED_BY_CSWsamba-client += CSWsambaclient -CATALOGNAME_CSWsambaclient = samba_client_stub #PACKAGES += CSWsambadoc SPKG_DESC_CSWsambadoc = Samba documentation ARCHALL_CSWsambadoc = 1 PACKAGES += CSWlibsmbclient0 +CATALOGNAME_CSWlibsmbclient0 = libsmbclient0 SPKG_DESC_CSWlibsmbclient0 = Samba client library, libsmbclient.so.0 PKGFILES_CSWlibsmbclient0 += $(call pkgfiles_lib,libsmbclient.so.0) PKGFILES_CSWlibsmbclient0 += $(mandir)/man7/libsmbclient\.7 @@ -105,14 +109,17 @@ RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtevent0 OBSOLETED_BY_CSWlibsmbclient0 += CSWsambalib CATALOGNAME_CSWsambalib = samba_lib_stub PACKAGES += CSWlibwbclient0 +CATALOGNAME_CSWlibwbclient0 = libwbclient0 PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0) SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0 PACKAGES += CSWlibnetapi0 +CATALOGNAME_CSWlibnetapi0 = libnetapi0 PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2 @@ -126,21 +133,32 @@ RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtevent0 PACKAGES += CSWlibsmbsharemodes0 +CATALOGNAME_CSWlibsmbsharemodes0 = libsmbsharemodes0 PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0 RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibtdb1 PACKAGES += CSWlibtdb1 +CATALOGNAME_CSWlibtdb1 = libtdb1 PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 PACKAGES += CSWlibnss-winbind1 +CATALOGNAME_CSWlibnss-winbind1 = libnss_winbind1 PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1) SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1 +PACKAGES += CSWlibtevent0 +CATALOGNAME_CSWlibtevent0 = libtevent0 +PKGFILES_CSWlibtevent0 += $(call baseisadirs,$(libdir),libtevent\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibtevent0 += $(DESCRIPTION), libtevent.so.0 +RUNTIME_DEP_PKGS_CSWlibtevent0 += CSWlibtalloc2 + PACKAGES += CSWsamba-dev +CATALOGNAME_CSWsambalibdev = samba_libdev_stub SPKG_DESC_CSWsamba-dev = Development files for Samba, libsmbclient.so.0 PKGFILES_CSWsamba-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibsmbclient0 @@ -149,14 +167,14 @@ RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibsmbsharemodes0 RUNTIME_DEP_PKGS_CSWsamba-dev += CSWsamba +RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibtevent0 OBSOLETED_BY_CSWsamba-dev += CSWsambalibdev -CATALOGNAME_CSWsambalibdev = samba_libdev_stub PACKAGES += CSWsamba-swat +CATALOGNAME_CSWsambaswat = samba_swat_stub SPKG_DESC_CSWsamba-swat = Web-based samba administration tools PKGFILES_CSWsamba-swat += $(call baseisadirs,$(sbindir),swat) PKGFILES_CSWsamba-swat += $(mandir)/.*/swat\.* -#PKGFILES_CSWsamba-swat += $(sharedstatedir)/samba/swat/.* PKGFILES_CSWsamba-swat += $(prefix)/swat/.* RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibiconv2 @@ -171,8 +189,8 @@ RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtevent0 OBSOLETED_BY_CSWsamba-swat = CSWsambaswat -CATALOGNAME_CSWsambaswat = samba_swat_stub # Just docs, override for now CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html @@ -220,6 +238,7 @@ CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html PACKAGES += CSWsamba-winbind +CATALOGNAME_CSWsambawb = samba_wb_stub SPKG_DESC_CSWsamba-winbind = Tools to authenticate users from active directory using winbind PKGFILES_CSWsamba-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) PKGFILES_CSWsamba-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo @@ -243,13 +262,14 @@ RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtevent0 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb -CATALOGNAME_CSWsambawb = samba_wb_stub CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1 # Needed as the configure script doesn't add it -EXTRA_LINKER_FLAGS += -lintl -z ignore -z lazyload +EXTRA_LINKER_FLAGS += -lintl +EXTRA_LINKER_FLAGS += -z ignore -z lazyload BUILD64 = 1 ISAEXEC = 1 Modified: csw/mgar/pkg/samba/branches/samba3/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba3/checksums 2013-06-20 20:48:57 UTC (rev 21386) +++ csw/mgar/pkg/samba/branches/samba3/checksums 2013-06-20 21:25:52 UTC (rev 21387) @@ -1 +1 @@ -d9424e9badb089bd51e6cfc752b21dfa samba-3.6.15.tar.gz +12c6785802813c2c5bf66e5c4c4e1d93 samba-3.6.16.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 Jun 21 15:49:16 2013 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 21 Jun 2013 13:49:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21388] csw/mgar/pkg/denyhosts/trunk Message-ID: Revision: 21388 http://gar.svn.sourceforge.net/gar/?rev=21388&view=rev Author: dmichelsen Date: 2013-06-21 13:49:12 +0000 (Fri, 21 Jun 2013) Log Message: ----------- denyhosts/trunk: Fix #4491, #4492 and #4493 Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile csw/mgar/pkg/denyhosts/trunk/checksums Added Paths: ----------- csw/mgar/pkg/denyhosts/trunk/files/07_regex.patch csw/mgar/pkg/denyhosts/trunk/files/09_plugin_deny.patch csw/mgar/pkg/denyhosts/trunk/files/10_create_timestamp.patch Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2013-06-20 21:25:52 UTC (rev 21387) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2013-06-21 13:49:12 UTC (rev 21388) @@ -18,39 +18,43 @@ DenyHosts attempts to address the above. endef -SPKG_SOURCEURL = http://denyhosts.sf.net/ MASTER_SITES = $(SF_MIRRORS) DISTNAME = DenyHosts-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.gz + +# Selected patches from ftp://ftp.debian.org/debian/pool/main/d/denyhosts/denyhosts_2.6-7.debian.tar.gz +# as reported in https://www.opencsw.org/mantis/view.php?id=4491 +PATCHFILES += 07_regex.patch +PATCHFILES += 09_plugin_deny.patch +PATCHFILES += 10_create_timestamp.patch + LICENSE = LICENSE.txt -ARCHALL = 1 -INITSMF = /etc/opt/csw/init.d/cswdenyhosts +VENDOR_URL = http://denyhosts.sf.net/ + PACKAGES = CSWdenyhosts - +SPKG_DECS_CSWdenyhosts = A tool to limit SSH brute force attacks +ARCHALL_CSWdenyhosts = 1 CHECKPKG_OVERRIDES_CSWdenyhosts += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWdenyhosts += catalogname-does-not-start-with-py_ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +INITSMF = /etc/opt/csw/init.d/cswdenyhosts # No test target TEST_SCRIPTS = EXTRA_INSTALL_ARGS += --no-compile -sysconfdir = /etc/opt/csw/ -localstatedir = /var/opt/csw/ -SAMPLECONF = $(sysconfdir)/denyhosts.cfg +PRESERVECONF = $(sysconfdir)/denyhosts.cfg include gar/category.mk # setup.py puts everything in /usr/share by default, adjust this to $(datadir) -pre-install-modulated: +pre-install: gsed -ie 's,/usr/share/denyhosts,$(datadir)/$(NAME),' $(WORKSRC)/setup.py @$(MAKECOOKIE) -post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME) -post-install-modulated: +post-install: DOCDEST = $(DESTDIR)$(docdir)/$(NAME) +post-install: ginstall -d $(DOCDEST) ginstall -d $(DESTDIR)$(sysconfdir) ginstall -d $(DESTDIR)$(sysconfdir)/init.d @@ -67,15 +71,19 @@ #Adjust config to match Solaris paths + our package paths gsed -i \ - -e 's,/var/log/secure,path to ssh log,' \ + -e 's,/var/log/secure,/var/log/authlog,' \ -e 's,/usr/share/denyhosts/data,$(localstatedir)/$(NAME),' \ -e 's,/var/lock/subsys/denyhosts,/var/opt/csw/run/denyhosts.pid,' \ -e 's,/var/log/denyhosts,$(localstatedir)/$(NAME)/$(NAME).log,' \ $(DESTDIR)$(sysconfdir)/denyhosts.cfg + # From http://denyhosts.sourceforge.net/solaris.txt + echo 'SSHD_FORMAT_REGEX=.* (sshd\[.*\]: \[ID \d* auth.info\]) (?P.*)' \ + >>$(DESTDIR)$(sysconfdir)/denyhosts.cfg + gsed -i \ -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ - $(DESTDIR)/opt/csw/lib/python2.6/site-packages/DenyHosts/constants.py + $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py #Adjust daemon-control-dist wrapper script to match our package paths gsed -i \ Modified: csw/mgar/pkg/denyhosts/trunk/checksums =================================================================== --- csw/mgar/pkg/denyhosts/trunk/checksums 2013-06-20 21:25:52 UTC (rev 21387) +++ csw/mgar/pkg/denyhosts/trunk/checksums 2013-06-21 13:49:12 UTC (rev 21388) @@ -1 +1 @@ -fc2365305a9402886a2b0173d1beb7df download/DenyHosts-2.6.tar.gz +fc2365305a9402886a2b0173d1beb7df DenyHosts-2.6.tar.gz Added: csw/mgar/pkg/denyhosts/trunk/files/07_regex.patch =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/07_regex.patch (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/07_regex.patch 2013-06-21 13:49:12 UTC (rev 21388) @@ -0,0 +1,13 @@ +Author: Nico Golde and Marco Bertorello +Description: Fix a vulnerability (CVE-2007-4323) and other problem with regexp +--- a/DenyHosts/regex.py ++++ b/DenyHosts/regex.py +@@ -17,7 +17,7 @@ + + FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P.*) .*from (?P.*)""") + +-FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups""") ++FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups$""") + + FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") + Added: csw/mgar/pkg/denyhosts/trunk/files/09_plugin_deny.patch =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/09_plugin_deny.patch (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/09_plugin_deny.patch 2013-06-21 13:49:12 UTC (rev 21388) @@ -0,0 +1,13 @@ +Author: Marco Bertorello +Description: Correct the upstream bug http://sourceforge.net/tracker/index.php?func=detail&aid=1734736&group_id=131204&atid=720419 +--- a/DenyHosts/deny_hosts.py ++++ b/DenyHosts/deny_hosts.py +@@ -443,7 +443,7 @@ + self.__report.add_section(msg, new_denied_hosts) + if self.__sync_server: self.sync_add_hosts(new_denied_hosts) + plugin_deny = self.__prefs.get('PLUGIN_DENY') +- if plugin_deny: plugin.execute(plugin_deny, deny_hosts) ++ if plugin_deny: plugin.execute(plugin_deny, new_denied_hosts) + + new_suspicious_logins = login_attempt.get_new_suspicious_logins() + if new_suspicious_logins: Added: csw/mgar/pkg/denyhosts/trunk/files/10_create_timestamp.patch =================================================================== --- csw/mgar/pkg/denyhosts/trunk/files/10_create_timestamp.patch (rev 0) +++ csw/mgar/pkg/denyhosts/trunk/files/10_create_timestamp.patch 2013-06-21 13:49:12 UTC (rev 21388) @@ -0,0 +1,13 @@ +Author: Marco Bertorello +Description: create a timestamp file if doesn't exist +--- a/DenyHosts/sync.py ++++ b/DenyHosts/sync.py +@@ -53,7 +53,7 @@ + def set_sync_timestamp(self, timestamp): + try: + fp = open(os.path.join(self.__work_dir, +- SYNC_TIMESTAMP), "w") ++ SYNC_TIMESTAMP), "a") + fp.write(timestamp) + except e: + error(e) 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 Jun 23 13:29:47 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 23 Jun 2013 11:29:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[21389] csw/mgar/pkg/scummvm/trunk/files/README.solaris Message-ID: Revision: 21389 http://gar.svn.sourceforge.net/gar/?rev=21389&view=rev Author: lblume Date: 2013-06-23 11:29:43 +0000 (Sun, 23 Jun 2013) Log Message: ----------- scummvm/trunk: Minor README update Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/files/README.solaris Modified: csw/mgar/pkg/scummvm/trunk/files/README.solaris =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/README.solaris 2013-06-21 13:49:12 UTC (rev 21388) +++ csw/mgar/pkg/scummvm/trunk/files/README.solaris 2013-06-23 11:29:43 UTC (rev 21389) @@ -5,16 +5,15 @@ Introduction ------------ - This package contains 32 & 64 bit binaries built for Solaris 10 and later. + This package contains 32 & 64 bit binaries built for Solaris 10. The version adapted to the currently loaded kernel will be automatically started when running ScummVM. - It was also tested and should work on OpenSolaris-related distros such as - OpenIndiana, Solaris 11. + It was also tested on OpenIndiana b157 and Solaris 11. Installation ------------ - Installation is done as root with the pkgadd command: + Installation is done as root with the pkgadd command as root: # pkgadd -d scummvm-x.y.z-solaris-arch.pkg all Or using sudo: @@ -22,7 +21,7 @@ $ sudo pkgadd -d scummvm-x.y.z-solaris-arch.pkg all It will be immediately usable as: - $ /opt/csw/bin/scummvm + $ /opt/csw/bin/scummvm To make it appear in the GNOME menus, please run the following commands, then log out and back in: @@ -35,11 +34,15 @@ ----- This package is built as part of the OpenCSW project that packages useful - programes for Solaris. Visit them at http://www/opencsw.org/ + software for Solaris. Visit them at http://www/opencsw.org/ All the needed libraries are included as a convenience, as I believe a games should be as easy to install and run as possible. - Have fun + To upgrade to later versions, it is recommended to install pkgutil: + http://www.opencsw.org/manual/for-administrators/getting-started.html + + + Have fun! -- Laurent ? opencsw.org @@ -54,6 +57,9 @@ ScummVM http://www.scummvm.org/ + + OpenCSW + http://www.opencsw.org/ SDL - Simple DirectMedia Layer http://www.libsdl.org/ 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 Jun 23 19:57:21 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 23 Jun 2013 17:57:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[21390] csw/mgar/pkg/scummvm/trunk/files Message-ID: Revision: 21390 http://gar.svn.sourceforge.net/gar/?rev=21390&view=rev Author: lblume Date: 2013-06-23 17:57:18 +0000 (Sun, 23 Jun 2013) Log Message: ----------- scummvm/trunk: More fixes for installation instructions Modified Paths: -------------- csw/mgar/pkg/scummvm/trunk/files/README.solaris csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop Modified: csw/mgar/pkg/scummvm/trunk/files/README.solaris =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/README.solaris 2013-06-23 11:29:43 UTC (rev 21389) +++ csw/mgar/pkg/scummvm/trunk/files/README.solaris 2013-06-23 17:57:18 UTC (rev 21390) @@ -23,18 +23,23 @@ It will be immediately usable as: $ /opt/csw/bin/scummvm - To make it appear in the GNOME menus, please run the following commands, - then log out and back in: + To make it appear in the GNOME menus, run the following commands, then + log out and back in: - $ sudo ln -s /opt/csw/share/pixmaps/scummvm.xpm /usr/share/pixmaps/ - $ sudo ln -s PRFXDIR/scummvm/share/scummvm/scummvm.desktop \ + As root: + # ln -s /opt/csw/share/applications/scummvm.desktop /usr/share/applications/ + + Or with sudo: + + $ sudo ln -s /opt/csw/share/applications/scummvm.desktop \ /usr/share/applications/ Notes ----- - This package is built as part of the OpenCSW project that packages useful - software for Solaris. Visit them at http://www/opencsw.org/ + This package is built as part of OpenCSW, an easy to use open source + software distribution for Solaris-based systems. + t httpse visit at http://www/opencsw.org/ All the needed libraries are included as a convenience, as I believe a games should be as easy to install and run as possible. @@ -43,9 +48,10 @@ Have fun! - -- Laurent ? opencsw.org + -- laurent ? opencsw.org + Remerciements/Thanks -------------------- Modified: csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop =================================================================== --- csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop 2013-06-23 11:29:43 UTC (rev 21389) +++ csw/mgar/pkg/scummvm/trunk/files/scummvm.desktop 2013-06-23 17:57:18 UTC (rev 21390) @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=ScummVM -Exec=scummvm -Icon=scummvm.xpm +Exec=/opt/csw/bin/scummvm +Icon=/opt/csw/share/pixmaps/scummvm.xpm Terminal=false Type=Application StartupNotify=false 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 Jun 25 14:14:09 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 25 Jun 2013 12:14:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21391] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: Revision: 21391 http://gar.svn.sourceforge.net/gar/?rev=21391&view=rev Author: lblume Date: 2013-06-25 12:14:07 +0000 (Tue, 25 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.12 based on the 5.5 recipe and the settings of the official build Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-23 17:57:18 UTC (rev 21390) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 12:14:07 UTC (rev 21391) @@ -10,17 +10,38 @@ # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide -PROJ_NAME = mysql -NAME = $(PROJ_NAME)5 +PROJ_NAME = mysql +NAME = $(PROJ_NAME)5 BASE_VERSION = 5.6 -PATCHLEVEL = 10 -ALTS_PRIO = 56 +PATCHLEVEL = 12 +ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG +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: +ifneq ($(shell /usr/bin/uname -r),5.9) + GARCOMPILER = SOS12U3 +endif + +# There is some assembler code, which doesn't work on sparcv8, and I don't see +# an easy way to switch it off. +ISA_DEFAULT_sparc-5.9 = sparcv8plus + +# Solaris 10 needs a special map file since we need libnsl Version 1.9.1 +# and libc 1.22.5 + +ifneq ($(shell /usr/bin/uname -r),5.9) + LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" +endif + + + DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -30,16 +51,20 @@ (Structured Query Language) database server. endef -# There are problems with the build using Sun Studio. -# GARCOMPILER = SOS12 -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -GARCOMPILER = GNU +# 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 -xnorunpath +EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -norunpath -NOGITPATCH ?= 1 +# 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)) -#Mapfile: -LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" INITSMF = $(sysconfdir)/init\.d/csw$(NAME) @@ -65,21 +90,14 @@ PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 -CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 -#PATCHFILES += 0003-I-HATE-CMAKE.patch -# PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch -PATCHFILES += 0005-Do-not-strip-RPATH-from-binaries.patch -#PATCHFILES += 0002-do_not_use_libstlport.patch -PATCHFILES += mysql-bug.67018.patch -PATCHFILES += 0003-it_is_lz_not_lzlib.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 -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWlibmysqlclient18 += CSWlibgcc-s1 +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)) PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -112,43 +130,53 @@ 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 += CSWlibgcc-s1 -# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) -# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl0-9-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)) CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we # must build for sparcv8+ on Solaris 9. -CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement -CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement -CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement +ifeq ($(shell /usr/bin/uname -pr),5.9 sparc) + CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement + CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement + CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement +endif +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) += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 -# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstlport1 +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)) 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 +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 +# An example: +# s9_preload.so.1|is|needed|by|/opt/csw/bin/innochecksum|but|never|used +#CHECKPKG_OVERRIDES_CSW$(NAME) += soname-unused + EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* +# 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)) -# Enable 64 bits build -BUILD64 = 1 - -MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ +MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ +MASTER_SITES += http://mysql.skynet.be/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl DISTFILES += quick_start-csw @@ -164,69 +192,68 @@ BUILD_DEP_PKGS += CSWcmake BUILD_DEP_PKGS += CSWbison -# Set ./configure options -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-assembler -# Why not have a docs package? -# CONFIGURE_ARGS += --without-docs -CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --with-charset=utf8 -CONFIGURE_ARGS += --with-extra-charsets=all -CONFIGURE_ARGS += --with-low-memory -CONFIGURE_ARGS += --with-pthread -CONFIGURE_ARGS += --with-readline -CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-plugins=max-no-ndb -CONFIGURE_ARGS += --with-comment="(OpenCSW)" -CONFIGURE_ARGS += --with-mysqld-user=mysql -CONFIGURE_ARGS += --with-fast-mutexes -CONFIGURE_ARGS += --with-libwrap -CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc -CONFIGURE_ARGS += --with-big-tables -CONFIGURE_ARGS += --enable-thread-safe-client -CONFIGURE_ARGS_DBG = --with-debug -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) - # 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 += -DSYSCONFDIR=$(sysconfdir) CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) -# CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin -CMAKE_ARGS += -DWITH_READLINE=1 CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci -CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' -#Hardcode Sunstudio compiler: -#CMAKE_ARGS += -DCMAKE_C_COMPILER="/opt/solarisstudio12.3/bin/cc" -#CMAKE_ARGS += -DCMAKE_CXX_COMPILER="/opt/solarisstudio12.3/bin/CC" -CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCOMPILATION_COMMENT='OpenCSW' CMAKE_ARGS += -DBUILD_CONFIG=mysql_release -# CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)" -# CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" -# CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) -# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so -# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so +CMAKE_ARGS += -DC_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS"$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" -CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" -CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" -CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)" CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON -# TODO: Make the tests pass. They don't at the moment. -SKIPTEST ?= 1 -TEST_SCRIPTS = custom -TEST_TARGETS = check +CMAKE_ARGS += -DBISON_EXECUTABLE=/opt/csw/bin/bison +# The line below come from the official MySQL build configuration +CMAKE_ARGS += "-DENABLED_PROFILING:BOOL=ON" +CMAKE_ARGS += "-DENABLE_DEBUG_SYNC:BOOL=ON" +CMAKE_ARGS += "-DENABLE_DOWNLOADS:BOOL=OFF" +CMAKE_ARGS += "-DENABLE_GCOV:BOOL=OFF" +CMAKE_ARGS += "-DENABLE_GPROF:BOOL=OFF" +CMAKE_ARGS += "-DENABLE_MEMCACHED_SASL:BOOL=OFF" +CMAKE_ARGS += "-DENABLE_MEMCACHED_SASL_PWDB:BOOL=OFF" +CMAKE_ARGS += "-DFEATURE_SET:STRING=community" +CMAKE_ARGS += "-DMYSQL_MAINTAINER_MODE:BOOL=OFF" +CMAKE_ARGS += "-DOPTIMIZER_TRACE:BOOL=ON" +CMAKE_ARGS += "-DWITH_ARCHIVE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_BLACKHOLE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_DEBUG:BOOL=OFF" +CMAKE_ARGS += "-DWITH_DEFAULT_COMPILER_OPTIONS:BOOL=ON" +CMAKE_ARGS += "-DWITH_DEFAULT_FEATURE_SET:BOOL=ON" +CMAKE_ARGS += "-DWITH_EDITLINE:STRING=bundled" +CMAKE_ARGS += "-DWITH_EMBEDDED_SERVER:BOOL=ON" +CMAKE_ARGS += "-DWITH_EXAMPLE_STORAGE_ENGINE:BOOL=OFF" +CMAKE_ARGS += "-DWITH_EXTRA_CHARSETS:STRING=all" +CMAKE_ARGS += "-DWITH_FEDERATED_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_INNOBASE_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_INNODB_MEMCACHED:BOOL=1" +CMAKE_ARGS += "-DWITH_LIBEVENT:STRING=bundled" +CMAKE_ARGS += "-DWITH_LIBWRAP:BOOL=OFF" +CMAKE_ARGS += "-DWITH_PARTITION_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_PIC:BOOL=ON" +CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" +CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" +CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" +ifneq ($(shell /usr/bin/uname -r),5.9) +CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" +endif + USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir @@ -242,7 +269,6 @@ CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME) -CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root$(prefix)/share/man/man1/mysqlaccess.1 # This could be reviewed. CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -289,17 +315,11 @@ CONFIGURE_SCRIPTS = custom +TEST_TARGET = test + include gar/category.mk -test-custom: - alias sh=/usr/bin/bash; \ - cd $(WORKSRC)/mysql-test; \ - perl mysql-test-run.pl --mem --big-test --force \ - --skip-test=archive-big --skip-test=/gis/ - configure-custom: - # --debug-output \ - # --debug-trycompile \ (cd $(WORKSRC) && \ /usr/bin/env -i \ $(CONFIGURE_ENV) \ @@ -310,11 +330,11 @@ post-configure-modulated: gsed \ - -e 's+ at prefix@+$(prefix)+' \ - -e 's+ at localstatedir@+$(localstatedir)+' \ - -e 's+ at sysconfdir@+$(sysconfdir)+' \ - -e 's+ at bindir@+$(bindir)+' \ - -e 's+ at BASE_VERSION@+$(BASE_VERSION)+' \ + -e 's+ at prefix@+$(prefix)+g' \ + -e 's+ at localstatedir@+$(localstatedir)+g' \ + -e 's+ at sysconfdir@+$(sysconfdir)+g' \ + -e 's+ at bindir@+$(bindir)+g' \ + -e 's+ at BASE_VERSION@+$(BASE_VERSION)+g' \ < $(WORKDIR)/csw$(NAME).tpl \ > $(WORKDIR)/csw$(NAME) @$(MAKECOOKIE) @@ -322,16 +342,12 @@ post-install-modulated: ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d ginstall -m 755 $(WORKDIR)/csw$(NAME) $(DESTDIR)$(sysconfdir)/init.d - # # Add versions to binary names - # for f in $(EXECUTABLES); do \ - # gmv -v "$(DESTDIR)$(bindir)/$${f}" \ - # "$(DESTDIR)$(bindir)/$${f}"; \ - # done (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) - # gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1 + # Do not distribute libstlport with MySQL, use a separate one + (cd $(DESTDIR)$(libdir); rm libstlport.*) @$(MAKECOOKIE) post-merge: @@ -344,7 +360,6 @@ $(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 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql 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/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-23 17:57:18 UTC (rev 21390) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-25 12:14:07 UTC (rev 21391) @@ -1 +1 @@ -9dcee911fb4bc7e977a6b63f4d3ffa63 mysql-5.6.10.tar.gz +0314b72fe1698d8e49e039d27523cce7 mysql-5.6.12.tar.gz 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-06-23 17:57:18 UTC (rev 21390) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/CSWmysql5.postinstall 2013-06-25 12:14:07 UTC (rev 21391) @@ -87,19 +87,6 @@ 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." -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi -if [ $smf = yes ] -then - echo "Running \`svcadm enable cswmysql5\` start to start the database." - # First, we clear the status, since it's likely to be 'maintenance'. - svcadm disable cswmysql5 - svcadm clear cswmysql5 - svcadm enable cswmysql5 -else - echo "Running \`/etc/opt/csw/init.d/cswmysql\` start to start the database." - /etc/opt/csw/init.d/cswmysql start -fi exit 0 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl 2013-06-23 17:57:18 UTC (rev 21390) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/files/cswmysql5.tpl 2013-06-25 12:14:07 UTC (rev 21391) @@ -1,206 +1,424 @@ #!/bin/sh # vim:ft=sh: # -# $Id$ -# Start script for MySQL database. +# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB +# This file is public domain and comes with NO WARRANTY of any kind + +# MySQL daemon start/stop script. + +# Usually this is put in /etc/init.d (at least on machines SYSV R4 based +# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql. +# When this is done the mysql server will be started when the machine is +# started and shut down when the systems goes down. + +# Comments for OpenCSW's CAS scripts +#RC_KNUM 01 +#RC_SNUM 99 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI network +#AUTOENABLE no + +# If you install MySQL on some other places than @prefix@, then you +# have to do one of the following things for this script to work: # -# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod -# 700. +# - Run this script from within the MySQL installation directory +# - Create a @sysconfdir@/my.cnf file with the following information: +# [mysqld] +# basedir= +# - Add the above to any other configuration file (for example ~/.my.ini) +# and copy my_print_defaults to /usr/bin +# - Add the path to the mysql-installation-directory to the basedir variable +# below. # -# First time installation can use quick_start-csw in -# /opt/csw/mysql5/share/mysql to build the mysql database for the -# grant tables. Or create the initial database yourself. +# If you want to affect other MySQL variables, you should make your changes +# in the @sysconfdir@/my.cnf, ~/.my.cnf or other MySQL configuration files. + +# If you change base dir, you must also change datadir. These may get +# overwritten by settings in the MySQL configuration files. + +basedir= +datadir= + +# Default value, in seconds, afterwhich the script should timeout waiting +# for server start. +# Value here is overriden by value in my.cnf. +# 0 means don't wait at all +# Negative numbers mean to wait indefinitely +service_startup_timeout=900 + +# Lock directory for RedHat / SuSE. +lockdir='/var/lock/subsys' +lock_file_path="$lockdir/mysql" + +# The following variables are only set for letting mysql.server find things. + +# Set some defaults +mysqld_pid_file_path= +if test -z "$basedir" +then + basedir=@prefix@ + bindir=@bindir@ + if test -z "$datadir" + then + datadir=@localstatedir@ + fi + sbindir=@prefix@/libexec + libexecdir=@prefix@/libexec +else + bindir="$basedir/bin" + if test -z "$datadir" + then + datadir="$basedir/data" + fi + sbindir="$basedir/libexec" + libexecdir="$basedir/libexec" +fi + +# datadir_set is used to determine if datadir was set (and so should be +# *not* set inside of the --basedir= handler.) +datadir_set= + # -# Use my.cnf for startup options. See MySQL documention -# for 'Using Option Files'. -# Support for mysql5rc still remains in this startup script. +# Use LSB init script functions for printing messages, if possible # +lsb_functions="/lib/lsb/init-functions" +if test -f $lsb_functions ; then + . $lsb_functions +else + log_success_msg() + { + echo " SUCCESS! $@" + } + log_failure_msg() + { + echo " ERROR! $@" + } +fi -RETVAL=0 -prefix="@prefix@" -BASEDIR="${prefix}" -BINDIR="@bindir@" -MYSQL_VAR="@localstatedir@" -sysconfdir="@sysconfdir@" -BASE_VERSION="@BASE_VERSION@" -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=${sysconfdir}/my.cnf +PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin" +export PATH +mode=$1 # start or stop + +[ $# -ge 1 ] && shift + + +other_args="$*" # uncommon, but needed when called from an RPM upgrade action + # Expected: "--skip-networking --skip-grant-tables" + # They are not checked here, intentionally, as it is the resposibility + # of the "spec" file author to give correct arguments only. + +case `echo "testing\c"`,`echo -n testing` in + *c*,-n*) echo_n= echo_c= ;; + *c*,*) echo_n=-n echo_c= ;; + *) echo_n= echo_c='\c' ;; +esac + +parse_server_arguments() { + for arg do + case "$arg" in + # $mysql5_arch must have been set (or left empty) for Solaris + # by the OpenCSW architecture selection bit + --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` + bindir="$basedir/bin/$mysql5_arch" + if test -z "$datadir_set"; then + datadir="$basedir/data" + fi + sbindir="$basedir/sbin/$mysql5_arch" + libexecdir="$basedir/libexec/$mysql5_arch" + ;; + --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` + datadir_set=1 + ;; + --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; + --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; + esac + done +} + +wait_for_pid () { + verb="$1" # created | removed + pid="$2" # process ID of the program operating on the pid-file + pid_file_path="$3" # path to the PID file. + + i=0 + avoid_race_condition="by checking again" + + while test $i -ne $service_startup_timeout ; do + + case "$verb" in + 'created') + # wait for a PID-file to pop into existence. + test -s "$pid_file_path" && i='' && break + ;; + 'removed') + # wait for this PID-file to disappear + test ! -s "$pid_file_path" && i='' && break + ;; + *) + echo "wait_for_pid () usage: wait_for_pid created|removed pid pid_file_path" + exit 1 + ;; + esac + + # if server isn't running, then pid-file will never be updated + if test -n "$pid"; then + if kill -0 "$pid" 2>/dev/null; then + : # the server still runs + else + # The server may have exited between the last pid-file check and now. + if test -n "$avoid_race_condition"; then + avoid_race_condition="" + continue # Check again. + fi + + # there's nothing that will affect the file. + log_failure_msg "The server quit without updating PID file ($pid_file_path)." + return 1 # not waiting any more. + fi + fi + + echo $echo_n ".$echo_c" + i=`expr $i + 1` + sleep 1 + + done + + if test -z "$i" ; then + log_success_msg + return 0 + else + log_failure_msg + return 1 + fi +} + +### START OPENCSW ARCHITECTURE SELECTION # Source the configuration -[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc -[ -r @prefix@/etc/mysql5rc ] && . @prefix@/etc/mysql5rc -[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc +# This is used to define the binary architeture to run -if [ -r "${sysconfdir}/my.cnf" ]; then - MYSQL_HOME="${MYSQL_VAR}" -elif [ -r "${BASEDIR}/my.cnf" ]; then - MYSQL_HOME="${BASEDIR}" +# Check the old location first +[ -r @prefix@/etc/csw.conf ] && . @prefix@/etc/csw.conf + +# Check the current location, its content overrides the previous one +[ -r @sysconfdir@/csw.conf ] && . @sysconfdir@/csw.conf + +# If the package-specific variable is not set, try the default +if [ -z "$mysql5_arch" ]; then + if [ -n "$default_arch" ]; then + mysql5_arch="$default_arch" + fi +else + # In that specific case, by default, there is no subdir + if [ "$mysql5_arch" = "i386" -o "$mysql5_arch" = "sparc" ]; then + mysql5_arch="" + fi fi -export MYSQL_HOME -# To get started quickly, copy a sample configuration file from -# $BASEDIR/share/mysql -# For example, -# cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf -# -# Or, manually follow the database creation steps below, and have -# mysql just use defaults for everything. +# If a value was found +if [ -n "$mysql5_arch" ]; then + if [ "$mysql5_arch" = "kernel" ]; then + # Use the system's default arch + mysql5_arch=`isainfo -k` + fi -# 2006-03-11 Changed to only look for the grant tables database -# 2006-04-16 Changed again. Look for either the grant tables database -# or the options file. -# 2006-12-28 Fix problem. Look for either the grant tables database in -# the default location or the default options file. -if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then - exit 0 + # Add the architecture suffix to the executables' directories, if it exists + # The binaries themselves are tested below, so the script should fail + # mostly gracefully if a non-present arch is set up. + if [ -d "$bindir/$mysql5_arch" -a \ + -d "$sbindir/$mysql5_arch" -a \ + -d "$libexecdir/$mysql5_arch" ]; then + bindir="$bindir/$mysql5_arch" + sbindir="$sbindir/$mysql5_arch" + libexecdir="$libexecdir/$mysql5_arch" + fi fi +### END OPENCSW ARCHITECTURE SELECTION -# If CONFFILE is the server default file, unset CONFFILE -if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ - -o \ - "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then - CONFFILE= +# Get arguments from the my.cnf file, +# the only group, which is read from now on is [mysqld] +if test -x ./bin/my_print_defaults +then + print_defaults="./bin/my_print_defaults" +elif test -x $bindir/my_print_defaults +then + print_defaults="$bindir/my_print_defaults" +elif test -x $bindir/mysql_print_defaults +then + print_defaults="$bindir/mysql_print_defaults" +else + # Try to find basedir in @sysconfdir@/my.cnf + conf=@sysconfdir@/my.cnf + print_defaults= + if test -r $conf + then + subpat='^[^=]*basedir[^=]*=\(.*\)$' + dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf` + for d in $dirs + do + d=`echo $d | sed -e 's/[ ]//g'` + if test -x "$d/bin/my_print_defaults" + then + print_defaults="$d/bin/my_print_defaults" + break + fi + if test -x "$d/bin/mysql_print_defaults" + then + print_defaults="$d/bin/mysql_print_defaults" + break + fi + done + fi + + # Hope it's in the PATH ... but I doubt it + test -z "$print_defaults" && print_defaults="my_print_defaults" fi -# If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR -# Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then - MYSQLD_DATADIR= +# +# Read defaults file from 'basedir'. If there is no defaults file there +# check if it's in the old (depricated) place (datadir) and read it from there +# + +extra_args="" +if test -r "$basedir/my.cnf" +then + extra_args="-e $basedir/my.cnf" +else + if test -r "$datadir/my.cnf" + then + extra_args="-e $datadir/my.cnf" + fi fi -# Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} +parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` -# If a database already exists, start whether or not there is a conf file. -# If no conf file, the database will just use internal defaults for everything. +# +# Set pid file if not given +# +if test -z "$mysqld_pid_file_path" +then + mysqld_pid_file_path=$datadir/`hostname`.pid +else + case "$mysqld_pid_file_path" in + /* ) ;; + * ) mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;; + esac +fi -start_it() { - if test -r $MYSQLD_PID_FILE ; then - if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "${MYSQLD_PROG} (`cat $MYSQLD_PID_FILE`) seems to be running." - return 1 - fi - fi +case "$mode" in + 'start') + # Start daemon - printf "%-60s" "Starting ${MYSQLD_PROG}: " + # Safeguard (relative paths, core dumps..) + # Changed to /opt for OpenCSW to avoid mysqld_safe picking the 32 bit + # binary in libexec/ + cd /opt - # 2006-03-11 - # This script no longer creates the default database. You may create the - # default database manually or use - # /opt/csw/mysql5/share/mysql/quick_start-csw - # if [ ! -d "$BASEDIR/var/mysql" ] ; then - # echo MySQL core database has not been created. - # echo Creating it now... - # $BASEDIR/bin/mysql_install_db - # chown -R mysql:mysql $BASEDIR/var - # fi + echo $echo_n "Starting MySQL" + if test -x $bindir/mysqld_safe + then + # Give extra arguments to mysqld with the my.cnf file. This script + # may be overwritten at next upgrade. + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null 2>&1 & + wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$? - # 2006-04-16 --defaults-file is changed to --defaults-extra-file - ${BINDIR}/mysqld_safe \ - `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ - --pid-file=$MYSQLD_PID_FILE \ - `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ - `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \ - `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \ - `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \ - `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \ - `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \ - `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \ - `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \ - `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \ - `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \ - `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \ - `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \ - `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \ - `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \ - `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \ - `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \ - `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \ - `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \ - `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \ - `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \ - `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \ - `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \ - `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \ - `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \ - `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \ - `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \ - `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \ - `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \ - `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \ - `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \ - `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \ - `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \ - `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \ - `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \ - `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \ - `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \ - `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \ - `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \ - `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \ - `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \ - `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \ - `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \ - `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \ - & >/dev/null 2>&1 - RETVAL=$? - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + # Make lock for RedHat / SuSE + if test -w "$lockdir" + then + touch "$lock_file_path" + fi + + exit $return_value else - echo "[FAILED]" - return 1 + log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)" fi - return 0 -} + ;; -stop_it() { + 'stop') + # Stop daemon. We use a signal here to avoid having to know the + # root password. - printf "%-60s" "Shutting down mysqld: " - if test -f "$MYSQLD_PID_FILE" ; then - pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 - kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 - RETVAL=$? + if test -s "$mysqld_pid_file_path" + then + mysqld_pid=`cat "$mysqld_pid_file_path"` + + if (kill -0 $mysqld_pid 2>/dev/null) + then + echo $echo_n "Shutting down MySQL" + kill $mysqld_pid + # mysqld should remove the pid file when it exits, so wait for it. + wait_for_pid removed "$mysqld_pid" "$mysqld_pid_file_path"; return_value=$? + else + log_failure_msg "MySQL server process #$mysqld_pid is not running!" + rm "$mysqld_pid_file_path" + fi + + # Delete lock for RedHat / SuSE + if test -f "$lock_file_path" + then + rm -f "$lock_file_path" + fi + exit $return_value else - RETVAL=1 + log_failure_msg "MySQL server PID file could not be found!" fi - if [ $RETVAL = 0 ] ; then - echo "[ OK ]" + ;; + + 'restart') + # Stop the service and regardless of whether it was + # running or not, start it again. + if $0 stop $other_args; then + $0 start $other_args else - echo "[FAILED]" + log_failure_msg "Failed to stop running server, so refusing to try to start." + exit 1 fi - echo "" - return 0 -} - -pgrep_opts() { - if [ -x /bin/zonename ] - then - echo "-z `/bin/zonename`" - fi -} - -case $1 in - start) - start_it ;; - stop) - stop_it + 'reload'|'force-reload') + if test -s "$mysqld_pid_file_path" ; then + read mysqld_pid < "$mysqld_pid_file_path" + kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL" + touch "$mysqld_pid_file_path" + else + log_failure_msg "MySQL PID file could not be found!" + exit 1 + fi ;; - - restart) - stop_it - while pgrep `pgrep_opts` ${MYSQLD_PROG} > /dev/null - do - sleep 1 - done - start_it + 'status') + # First, check to see if pid file exists + if test -s "$mysqld_pid_file_path" ; then + read mysqld_pid < "$mysqld_pid_file_path" + if kill -0 $mysqld_pid 2>/dev/null ; then + log_success_msg "MySQL running ($mysqld_pid)" + exit 0 + else + log_failure_msg "MySQL is not running, but PID file exists" + exit 1 + fi + else + # Try to find appropriate mysqld process + mysqld_pid=`pgrep $libexecdir/mysqld` + if test -z "$mysqld_pid" ; then + if test -f "$lock_file_path" ; then + log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists" + exit 2 + fi + log_failure_msg "MySQL is not running" + exit 3 + else + log_failure_msg "MySQL is running but PID file could not be found" + exit 4 + fi + fi ;; - *) - echo "Usage: $0 { start | stop | restart } " + # usage + basename=`basename "$0"` + echo "Usage: $basename {start|stop|restart|reload|force-reload|status} [ MySQL server options ]" + exit 1 ;; esac -exit $RETVAL +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 25 15:41:44 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 25 Jun 2013 13:41:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[21392] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 21392 http://gar.svn.sourceforge.net/gar/?rev=21392&view=rev Author: cgrzemba Date: 2013-06-25 13:41:40 +0000 (Tue, 25 Jun 2013) Log Message: ----------- qt4-gcc/trunk: refine checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-25 12:14:07 UTC (rev 21391) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2013-06-25 13:41:40 UTC (rev 21392) @@ -178,7 +178,15 @@ RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstvideo0-10-0 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgstaudio0-10-0 CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50 -CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/twitter/twitter_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/flickr/flickr_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/samegame/samegame_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/rssnews/rssnews_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/photoviewer/photoviewer_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/calculator/calculator_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/declarative/snake/snake_harmattan.desktop +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri +CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/qt4/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus 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 Jun 25 17:04:12 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 25 Jun 2013 15:04:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[21393] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: Revision: 21393 http://gar.svn.sourceforge.net/gar/?rev=21393&view=rev Author: lblume Date: 2013-06-25 15:04:06 +0000 (Tue, 25 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Add warning about stlport 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-06-25 13:41:40 UTC (rev 21392) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 15:04:06 UTC (rev 21393) @@ -8,6 +8,12 @@ # # About building MySQL with cmake: # http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide +# +# !!WARNING!! +# From 5.6.4, stlport is used by default. +# It appears to not be used by libmysql*, so there should not be any binary +# incompatibility there. However, care must be taken that it does not creep +# in, either in the lib*.so or in the mysql_config script. PROJ_NAME = mysql 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 Jun 25 20:44:22 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 25 Jun 2013 18:44:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[21394] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: Revision: 21394 http://gar.svn.sourceforge.net/gar/?rev=21394&view=rev Author: lblume Date: 2013-06-25 18:44:18 +0000 (Tue, 25 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Remove Solaris 9 support Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 15:04:06 UTC (rev 21393) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-25 18:44:18 UTC (rev 21394) @@ -26,28 +26,14 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -# Use newest Sun Studio on Solaris10 to solve problems on Solaris10 x86 -# 64bit build: -ifneq ($(shell /usr/bin/uname -r),5.9) - GARCOMPILER = SOS12U3 -endif +GARCOMPILER = SOS12U3 -# There is some assembler code, which doesn't work on sparcv8, and I don't see -# an easy way to switch it off. -ISA_DEFAULT_sparc-5.9 = sparcv8plus - # Solaris 10 needs a special map file since we need libnsl Version 1.9.1 # and libc 1.22.5 +LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" -ifneq ($(shell /usr/bin/uname -r),5.9) - LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" -endif - - - DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -101,9 +87,7 @@ 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) += CSWlibssl1-0-0 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -137,19 +121,9 @@ 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 += CSWlibz1 -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 += CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry -# It's intentional. There's a sparcv8-incompatible assembler code there, so we -# must build for sparcv8+ on Solaris 9. -ifeq ($(shell /usr/bin/uname -pr),5.9 sparc) - CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement - CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement - CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement -endif - CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry PACKAGES += CSW$(NAME) @@ -157,9 +131,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstlport1 -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) += CSWlibssl1-0-0 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 @@ -174,12 +146,7 @@ EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* -# 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)) +BUILD64 = 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)/ @@ -256,9 +223,7 @@ CMAKE_ARGS += "-DWITH_READLINE:BOOL=ON" CMAKE_ARGS += "-DWITH_UNIT_TESTS:BOOL=ON" CMAKE_ARGS += "-DWITH_VALGRIND:BOOL=OFF" -ifneq ($(shell /usr/bin/uname -r),5.9) CMAKE_ARGS += "-DENABLE_DTRACE:BOOL=ON" -endif USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-25 15:04:06 UTC (rev 21393) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2013-06-25 18:44:18 UTC (rev 21394) @@ -1 +1 @@ -0314b72fe1698d8e49e039d27523cce7 mysql-5.6.12.tar.gz +5ff56a4fbb0b0c4e075c6f43ba9d007e mysql-5.6.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Jun 26 16:22:52 2013 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 26 Jun 2013 14:22:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[21395] csw/mgar/pkg/samba/trunk Message-ID: Revision: 21395 http://gar.svn.sourceforge.net/gar/?rev=21395&view=rev Author: janholzh Date: 2013-06-26 14:22:48 +0000 (Wed, 26 Jun 2013) Log Message: ----------- samba/trunk: more work for a release. But still lots of stuff which needs to be done Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/samba/trunk/files/nss_winbind.patch csw/mgar/pkg/samba/trunk/files/smbd_patch_for_setgroups.patch Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2013-06-25 18:44:18 UTC (rev 21394) +++ csw/mgar/pkg/samba/trunk/Makefile 2013-06-26 14:22:48 UTC (rev 21395) @@ -1,3 +1,7 @@ +#Todo stuff +# There are lots of files and libs which are part of samba 3 package too. There should be removed from packinging +# See http://sources.debian.net/src/samba4/4.0.3%2Bdfsg1-0.1/debian/rules +# All remaining libs are need to be split off. See debian package too. NAME = samba VERSION = 4.0.6 @@ -23,250 +27,180 @@ DISTFILES += cswkrb5.conf PATCHFILES += 0001-fix-xml.patch +#From https://bugzilla.samba.org/show_bug.cgi?id=7588 +PATCHFILES += nss_winbind.patch +PATCHFILES += smbd_patch_for_setgroups.patch BUILD_DEP_PKGS += CSWlibtalloc-dev PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PACKAGES += CSWsamba -SPKG_DESC_CSWsamba = $(DESCRIPTION) +PACKAGES += CSWsamba4 +SPKG_DESC_CSWsamba4 = $(DESCRIPTION) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWsamba += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibfam0 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibwbclient0 # Just docs override for now -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8 -CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8 +CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8 -PACKAGES += CSWsamba-client -SPKG_DESC_CSWsamba-client = Client binaries for samba -SMB_CLIENT_TOOLS = rpcclient smbcacls smbclient smbcquotas smbget smbspool smbtar smbtree -PKGFILES_CSWsamba-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1) -PKGFILES_CSWsamba-client += $(mandir)/man5/smbgetrc\.5 -PKGFILES_CSWsamba-client += $(mandir)/man8/smbspool\.8 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibtdb1 -OBSOLETED_BY_CSWsamba-client += CSWsambaclient -CATALOGNAME_CSWsambaclient = samba_client_stub +PACKAGES += CSWsamba4-client +SPKG_DESC_CSWsamba4-client = Client binaries for samba4 +SMB_CLIENT_TOOLS = cifsdd smbclient4 nmblookup4 +PKGFILES_CSWsamba4-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1) +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1 + # Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1 +CHECKPKG_OVERRIDES_CSWsamba4-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1 -#PACKAGES += CSWsambacommon -SPKG_DESC_CSWsambacommon = Shared support files for samba -RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl -RUNTIME_DEP_PKGS_CSWsambacommon += CSWreadline -RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibpopt -RUNTIME_DEP_PKGS_CSWsambacommon += CSWlibnet -RUNTIME_DEP_PKGS_CSWsambacommon += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWsambacommon += CSWiconv -RUNTIME_DEP_PKGS_CSWsambacommon += CSWggettext - #PACKAGES += CSWsambadoc SPKG_DESC_CSWsambadoc = Samba documentation ARCHALL_CSWsambadoc = 1 -PACKAGES += CSWlibsmbclient0 -SPKG_DESC_CSWlibsmbclient0 = Samba client library, libsmbclient.so.0 -PKGFILES_CSWlibsmbclient0 += $(call pkgfiles_lib,libsmbclient.so.0) -PKGFILES_CSWlibsmbclient0 += $(mandir)/man7/libsmbclient\.7 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibtdb1 -OBSOLETED_BY_CSWlibsmbclient0 += CSWsambalib -CATALOGNAME_CSWsambalib = samba_lib_stub - PACKAGES += CSWlibnetapi0 PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 -PACKAGES += CSWlibsmbsharemodes0 -PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) -SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0 - -PACKAGES += CSWlibtdb1 -PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) -SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibtdb1 - -PACKAGES += CSWlibwbclient0 -PKGFILES_CSWlibwbclient0 += $(call pkgfiles_lib,libwbclient.so.0) -SPKG_DESC_CSWlibwbclient0 += Samba client library, libwbclient.so.0 - -PACKAGES += CSWlibnetapi0 -PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0) -SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibldap2-4-2 - -PACKAGES += CSWlibsmbsharemodes0 -PKGFILES_CSWlibsmbsharemodes0 += $(call pkgfiles_lib,libsmbsharemodes.so.0) -SPKG_DESC_CSWlibsmbsharemodes0 += Samba client library, libsmbsharemodes.so.0 -RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibtdb1 - -PACKAGES += CSWlibtdb1 -PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) -SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 - PACKAGES += CSWlibnss-winbind1 PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1) SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1 -PACKAGES += CSWsamba-dev -SPKG_DESC_CSWsamba-dev = Development files for Samba, libsmbclient.so.0 -PKGFILES_CSWsamba-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibsmbclient0 -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibnetapi0 -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWlibsmbsharemodes0 -RUNTIME_DEP_PKGS_CSWsamba-dev += CSWsamba -OBSOLETED_BY_CSWsamba-dev += CSWsambalibdev -CATALOGNAME_CSWsambalibdev = samba_libdev_stub +PACKAGES += CSWsamba4-dev +SPKG_DESC_CSWsamba4-dev = Development files for Samba, libsmbclient.so.0 +PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbsharemodes0 +RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba -PACKAGES += CSWsamba-swat -SPKG_DESC_CSWsamba-swat = Web-based samba administration tools -PKGFILES_CSWsamba-swat += $(call baseisadirs,$(sbindir),swat) -PKGFILES_CSWsamba-swat += $(mandir)/.*/swat\.* -#PKGFILES_CSWsamba-swat += $(sharedstatedir)/samba/swat/.* -PKGFILES_CSWsamba-swat += $(prefix)/swat/.* -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibtdb1 -OBSOLETED_BY_CSWsamba-swat = CSWsambaswat -CATALOGNAME_CSWsambaswat = samba_swat_stub +PACKAGES += CSWsamba4-swat +SPKG_DESC_CSWsamba4-swat = Web-based samba administration tools +PKGFILES_CSWsamba4-swat += $(call baseisadirs,$(sbindir),swat) +PKGFILES_CSWsamba4-swat += $(mandir)/.*/swat\.* +PKGFILES_CSWsamba4-swat += $(sharedstatedir)/samba/swat/.* +PKGFILES_CSWsamba4-swat += $(prefix)/swat/.* +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtdb1 + # Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/appendix.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/secure.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/nw4migration.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-Developers-Guide/pwencrypt.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/classicalprinting.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/bugreport.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/compiling.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/NetworkBrowsing.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/domain-member.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/locking.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/samba-pdc.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/install.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/diagnosis.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/pam.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/winbind.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/AccessControls.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/swat.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/lmhosts.5.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/nmbd.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/idmap_tdb2.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smb.conf.5.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/winbindd.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbd.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/net.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/tdbbackup.8.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbclient.1.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/export/home|root/opt/csw/swat/help/Samba3-HOWTO/msdfs.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/ix01.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/appendix.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/happy.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/CUPS-printing.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html -CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/appendix.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/secure.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/nw4migration.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-Developers-Guide/pwencrypt.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/classicalprinting.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/bugreport.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/compiling.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/NetworkBrowsing.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/domain-member.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/locking.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/samba-pdc.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/install.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/diagnosis.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/pam.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/winbind.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/AccessControls.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/swat.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/lmhosts.5.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/nmbd.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/idmap_tdb2.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smb.conf.5.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/winbindd.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbd.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/net.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/tdbbackup.8.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbclient.1.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/export/home|root/opt/csw/swat/help/Samba3-HOWTO/msdfs.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/ix01.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/appendix.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/happy.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/CUPS-printing.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html +CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html -PACKAGES += CSWsamba-winbind -SPKG_DESC_CSWsamba-winbind = Tools to authenticate users from active directory using winbind -PKGFILES_CSWsamba-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) -PKGFILES_CSWsamba-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo -PKGFILES_CSWsamba-winbind += $(mandir)/man5/pam_winbind\.conf\.5 -PKGFILES_CSWsamba-winbind += $(mandir)/man7/winbind_krb5_locator\.7 -PKGFILES_CSWsamba-winbind += $(mandir)/man8/pam_winbind\.8 -PKGFILES_CSWsamba-winbind += $(call baseisadirs,$(sbindir),winbindd) -PKGFILES_CSWsamba-winbind += $(mandir)/man8/winbindd\.8 -PKGFILES_CSWsamba-winbind += /etc/opt/csw/init.d/cswwinbind -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibz1 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1 -OBSOLETED_BY_CSWsamba-winbind += CSWsambawb -CATALOGNAME_CSWsambawb = samba_wb_stub +PACKAGES += CSWsamba4-winbind +SPKG_DESC_CSWsamba4-winbind = Tools to authenticate users from active directory using winbind +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so) +PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo +PKGFILES_CSWsamba4-winbind += $(mandir)/man5/pam_winbind\.conf\.5 +PKGFILES_CSWsamba4-winbind += $(mandir)/man7/winbind_krb5_locator\.7 +PKGFILES_CSWsamba4-winbind += $(mandir)/man8/pam_winbind\.8 +PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd) +PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8 +PKGFILES_CSWsamba4-winbind += /etc/opt/csw/init.d/cswwinbind +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibz1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibwbclient0 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibnss-winbind1 # Just docs, override for now -CHECKPKG_OVERRIDES_CSWsamba-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8 -CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8 +CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWlibnss-winbind1 EXTRA_CFLAGS = -lrt -lintl -lsec EXTRA_LDFLAGS = -lrt -lintl -lsec @@ -281,6 +215,7 @@ SMBLOGDIR = $(localstatedir)/samba/log SMBPRIVATEDIR = $(sysconfdir)/samba/private SMBCONFIGDIR = $(sysconfdir)/samba +SMBPRIVATELIB = $(libdir)/samba CONFIGURE_ARGS += $(DIRPATHS) #Remove exec_prefix from DIRPATHS: @@ -302,12 +237,15 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount #CONFIGURE_ARGS += --with-dnsupdate=no -CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) +CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATELIB) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR) CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR) +# to stay with the one build with samba 3 build this one private +CONFIGURE_ARGS += --private-libraries=smbclient +CONFIGURE_ARGS += --with-privatelibdir=$(SMBPRIVATELIB) CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR) Added: csw/mgar/pkg/samba/trunk/files/nss_winbind.patch =================================================================== --- csw/mgar/pkg/samba/trunk/files/nss_winbind.patch (rev 0) +++ csw/mgar/pkg/samba/trunk/files/nss_winbind.patch 2013-06-26 14:22:48 UTC (rev 21395) @@ -0,0 +1,46 @@ +From 4f70bcf1aef5074f6689a6462e803961bdee7dbf Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Tue, 25 Jun 2013 15:35:33 +0200 +Subject: [PATCH 1/2] Fix nss winbind for more then 16 groups on Solaris + +--- + nsswitch/winbind_nss_linux.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c +index 8d66a74..aaabc96 100644 +--- a/nsswitch/winbind_nss_linux.c ++++ b/nsswitch/winbind_nss_linux.c +@@ -25,6 +25,8 @@ + #include + #endif + ++#include "lib/util/tsort.h" ++ + #if HAVE_PTHREAD + static pthread_mutex_t winbind_nss_mutex = PTHREAD_MUTEX_INITIALIZER; + #endif +@@ -1044,6 +1046,11 @@ _nss_winbind_getgrgid_r(gid_t gid, + + /* Initialise supplementary groups */ + ++static int gid_compare(void *gid_1, void *gid_2) ++{ ++ return (*(gid_t *)gid_1 - *(gid_t *)gid_2); ++} ++ + NSS_STATUS + _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, + long int *size, gid_t **groups, long int limit, +@@ -1075,6 +1082,8 @@ _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, + int num_gids = response.data.num_entries; + gid_t *gid_list = (gid_t *)response.extra_data.data; + ++ TYPESAFE_QSORT(gid_list, num_gids, gid_compare); ++ + #ifdef DEBUG_NSS + fprintf(stderr, "[%5d]: initgroups %s: got NSS_STATUS_SUCCESS " + "and %d gids\n", getpid(), +-- +1.7.9.2 + Added: csw/mgar/pkg/samba/trunk/files/smbd_patch_for_setgroups.patch =================================================================== --- csw/mgar/pkg/samba/trunk/files/smbd_patch_for_setgroups.patch (rev 0) +++ csw/mgar/pkg/samba/trunk/files/smbd_patch_for_setgroups.patch 2013-06-26 14:22:48 UTC (rev 21395) @@ -0,0 +1,78 @@ +From 3f6a1340d574cfa16515e0b9ba5b701e566ed07c Mon Sep 17 00:00:00 2001 +From: Ralph Boehme +Date: Tue, 25 Jun 2013 16:26:07 +0200 +Subject: [PATCH 2/2] Solaris sort groups patch + +--- + source3/lib/system.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/source3/lib/system.c b/source3/lib/system.c +index 8dbf7dc..33d2926 100644 +--- a/source3/lib/system.c ++++ b/source3/lib/system.c +@@ -879,14 +879,14 @@ int groups_max(void) + returning an array of gid_t, but actuall return an array of int. + ****************************************************************************/ + +-#if defined(HAVE_BROKEN_GETGROUPS) +- + #ifdef HAVE_BROKEN_GETGROUPS + #define GID_T int + #else + #define GID_T gid_t + #endif + ++#if defined(HAVE_BROKEN_GETGROUPS) ++ + static int sys_broken_getgroups(int setlen, gid_t *gidset) + { + GID_T gid; +@@ -929,6 +929,13 @@ static int sys_broken_getgroups(int setlen, gid_t *gidset) + return ngroups; + } + ++#endif /* HAVE_BROKEN_GETGROUPS */ ++ ++static int gid_compare(void *gid_1, void *gid_2) ++{ ++ return (*(GID_T *)gid_1 - *(GID_T *)gid_2); ++} ++ + static int sys_broken_setgroups(int setlen, gid_t *gidset) + { + GID_T *group_list; +@@ -955,6 +962,8 @@ static int sys_broken_setgroups(int setlen, gid_t *gidset) + for(i = 0; i < setlen; i++) + group_list[i] = (GID_T) gidset[i]; + ++ TYPESAFE_QSORT(group_list, setlen, gid_compare); ++ + if(samba_setgroups(setlen, group_list) != 0) { + int saved_errno = errno; + SAFE_FREE(group_list); +@@ -966,8 +975,6 @@ static int sys_broken_setgroups(int setlen, gid_t *gidset) + return 0 ; + } + +-#endif /* HAVE_BROKEN_GETGROUPS */ +- + /* This is a list of systems that require the first GID passed to setgroups(2) + * to be the effective GID. If your system is one of these, add it here. + */ +@@ -1058,11 +1065,8 @@ int sys_setgroups(gid_t UNUSED(primary_gid), int setlen, gid_t *gidset) + + #if defined(USE_BSD_SETGROUPS) + return sys_bsd_setgroups(primary_gid, setlen, gidset); +-#elif defined(HAVE_BROKEN_GETGROUPS) +- return sys_broken_setgroups(setlen, gidset); +-#else +- return samba_setgroups(setlen, gidset); + #endif ++ return sys_broken_setgroups(setlen, gidset); + } + + /************************************************************************** +-- +1.7.9.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 26 16:47:16 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 26 Jun 2013 14:47:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[21396] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 21396 http://gar.svn.sourceforge.net/gar/?rev=21396&view=rev Author: cgrzemba Date: 2013-06-26 14:47:13 +0000 (Wed, 26 Jun 2013) Log Message: ----------- netsnmp/trunk: fixing bug4770 bug4932 bug4442 Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-06-26 14:22:48 UTC (rev 21395) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-06-26 14:47:13 UTC (rev 21396) @@ -18,9 +18,14 @@ SF_PROJECT = net-snmp MASTER_SITES = $(SF_MIRRORS) -DISTNAME = $(SF_PROJ)-$(VERSION) +DISTNAME = $(SF_PROJECT)-$(VERSION) DISTFILES = $(DISTNAME).tar.gz +REINPLACE_USRLOCAL = dist/snmp*init.d +REINPLACE_USRLOCAL += perl/TrapReceiver/TrapReceiver.pm +REINPLACE_USRLOCAL += local/ipf-mod.pl +REINPLACE_USRLOCAL += local/traptoemail + # Patch for perl modules PATCHFILES = perl_makefiles.diff # Patch for python module @@ -33,6 +38,9 @@ BUILD_DEP_PKGS = CSWpysetuptools PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +INITSMF = /etc/init.d/snmpd +INITSMF = /etc/init.d/snmptrapd + PACKAGES += CSWnetsnmp-dev CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev SPKG_DESC_CSWnetsnmp-dev += $(DESCRIPTION), development files @@ -42,7 +50,7 @@ RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWnetsnmp-dev += CSWlibnetsnmpagent25 -CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl +# CHECKPKG_OVERRIDES_CSWnetsnmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/NetSNMP::TrapReceiver.3perl PACKAGES += CSWlibnetsnmp25 CATALOGNAME_CSWlibnetsnmp25 = libnetsnmp25 @@ -89,7 +97,7 @@ RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 -CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm +# CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibssl1-0-0 EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc @@ -110,13 +118,13 @@ RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibnetsnmpagent25 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWnetsnmp += CSWperl -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl -CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpcmd.1 +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/snmpconf.1 +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/snmpd.8 +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/snmpd.conf.5 +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/traptoemail +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/bin/ipf-mod.pl +# CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/share/snmp/mib2c-data/mfd-makefile.m2m CHECKPKG_OVERRIDES_CSWnetsnmp += file-with-bad-content|/usr/share|root/opt/csw/bin/net-snmp-cert # BUILD64 = 1 @@ -124,11 +132,12 @@ NOISALIST = 1 # The -I/opt/csw/include pulls in installed version before built version and breaks testsuite -CPPFLAGS = +# CPPFLAGS = EXTRA_CFLAGS = $(INCLUDE_FLAGS) # link not to the old already installed libs -LD_OPTIONS = +# LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -xnorunpath +# EXTRA_LDFLAGS = $(LD_OPTIONS) CONFIGURE_ARGS_mm-32 = --disable-embedded-perl CONFIGURE_ARGS_mm-32 += --with-perl-modules=yes @@ -192,6 +201,14 @@ CFLAGS := $(filter-out -I/opt/csw/include,$(CFLAGS)) # LDFLAGS := $(filter-out -R/opt/csw/lib% -L/opt/csw/lib,$(LDFLAGS)) +post-install: + ginstall -d $(DESTDIR)/etc/init.d + ginstall -d $(DESTDIR)/$(syconfdir)/snmp + ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/etc/init.d/snmpd + ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/etc/init.d/snmptrapd + ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(syconfdir)/snmp/snmpd + @$(MAKECOOKIE) + #post-install-isa-sparcv8: # ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -) # ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10 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 Jun 26 20:25:48 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 26 Jun 2013 18:25:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[21397] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile Message-ID: Revision: 21397 http://gar.svn.sourceforge.net/gar/?rev=21397&view=rev Author: lblume Date: 2013-06-26 18:25:44 +0000 (Wed, 26 Jun 2013) Log Message: ----------- mysql5/branches/mysql-5.6.x: Minor, maybe useless changes to linking 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-06-26 14:47:13 UTC (rev 21396) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2013-06-26 18:25:44 UTC (rev 21397) @@ -50,6 +50,7 @@ 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 -xnorunpath EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -norunpath +EXTRA_LDFLAGS += -Bdirect # The official build used -xO2 on 32 bit x86, -xO3 for 64 bit # Use that for all builds @@ -185,7 +186,8 @@ CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) CMAKE_ARGS += -DC_FLAGS="$(CFLAGS)" CMAKE_ARGS += -DCXX_FLAGS="$(CXXFLAGS)" -CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS"$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_C_LINK_FLAGS="$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS="$(LDFLAGS)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" 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 Jun 26 23:21:01 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 26 Jun 2013 21:21:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[21398] csw/mgar/pkg Message-ID: Revision: 21398 http://gar.svn.sourceforge.net/gar/?rev=21398&view=rev Author: lblume Date: 2013-06-26 21:20:57 +0000 (Wed, 26 Jun 2013) Log Message: ----------- bonnie++/trunk: Introducing bonnie++ Added Paths: ----------- csw/mgar/pkg/bonnie++/ csw/mgar/pkg/bonnie++/Makefile csw/mgar/pkg/bonnie++/branches/ csw/mgar/pkg/bonnie++/tags/ csw/mgar/pkg/bonnie++/trunk/ csw/mgar/pkg/bonnie++/trunk/Makefile csw/mgar/pkg/bonnie++/trunk/checksums csw/mgar/pkg/bonnie++/trunk/files/ Added: csw/mgar/pkg/bonnie++/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/Makefile (rev 0) +++ csw/mgar/pkg/bonnie++/Makefile 2013-06-26 21:20:57 UTC (rev 21398) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/bonnie++/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/bonnie++/trunk/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-26 21:20:57 UTC (rev 21398) @@ -0,0 +1,53 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = bonnie++ +VERSION = 1.97.1 +FILEVERSION = 1.97 +GARTYPE = v2 + +GARCOMPILER = GNU + +DESCRIPTION = A hard drive benchmark suite +define BLURB + Bonnie++ is a benchmark suite that is aimed at performing a number of simple tests of hard drive and file system performance. +endef + +MASTER_SITES = http://www.coker.com.au/bonnie++/experimental/ +DISTFILES = $(NAME)-$(FILEVERSION).tgz + +PACKAGES = CSWbonnie++ +CATALOGNAME_CSWbonnie++ = bonnie++ +SPKG_DESC_CSWbonnie++ = A benchmark suite aimed at performing a number of simple tests of hard drive and file system performance +RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibstdc++6 + +LICENSE = copyright.txt + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +SBINFILES = bonnie++ zcav getc_putc getc_putc_helper +BINFILES = bon_csv2html generate_randfile bon_csv2txt +MAN1FILES = bon_csv2html.1 bon_csv2txt.1 generate_randfile.1 +MAN8FILES = bonnie++.8 zcav.8 getc_putc.8 + +install-custom: + @echo " => Installing $(CATALOGNAME)" + ginstall -d $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(sbindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -d $(DESTDIR)$(mandir)/man8 + cd $(WORKSRC) && \ + ginstall -m 755 $(BINFILES) $(DESTDIR)$(bindir)/ && \ + ginstall -m 755 $(SBINFILES) $(DESTDIR)$(sbindir)/ && \ + ginstall -m 644 $(MAN1FILES) $(DESTDIR)$(mandir)/man1/ && \ + ginstall -m 644 $(MAN8FILES) $(DESTDIR)$(mandir)/man8/ + @$(MAKECOOKIE) + Property changes on: csw/mgar/pkg/bonnie++/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bonnie++/trunk/checksums =================================================================== --- csw/mgar/pkg/bonnie++/trunk/checksums (rev 0) +++ csw/mgar/pkg/bonnie++/trunk/checksums 2013-06-26 21:20:57 UTC (rev 21398) @@ -0,0 +1 @@ +d6cf9703242998b2ddc2d875b028b3c6 bonnie++-1.97.tgz 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 Jun 26 23:25:32 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Wed, 26 Jun 2013 21:25:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[21399] csw/mgar/pkg/bonnie++/trunk/Makefile Message-ID: Revision: 21399 http://gar.svn.sourceforge.net/gar/?rev=21399&view=rev Author: lblume Date: 2013-06-26 21:25:32 +0000 (Wed, 26 Jun 2013) Log Message: ----------- bonnie++/trunk: Shorten description Modified Paths: -------------- csw/mgar/pkg/bonnie++/trunk/Makefile Modified: csw/mgar/pkg/bonnie++/trunk/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-26 21:20:57 UTC (rev 21398) +++ csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-26 21:25:32 UTC (rev 21399) @@ -18,7 +18,7 @@ PACKAGES = CSWbonnie++ CATALOGNAME_CSWbonnie++ = bonnie++ -SPKG_DESC_CSWbonnie++ = A benchmark suite aimed at performing a number of simple tests of hard drive and file system performance +SPKG_DESC_CSWbonnie++ = A benchmark suite testing hard drive and file system performance RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 27 08:03:56 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Jun 2013 06:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[21400] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 21400 http://gar.svn.sourceforge.net/gar/?rev=21400&view=rev Author: cgrzemba Date: 2013-06-27 06:03:53 +0000 (Thu, 27 Jun 2013) Log Message: ----------- gstplugins/trunk: update version Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-26 21:25:32 UTC (rev 21399) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-27 06:03:53 UTC (rev 21400) @@ -19,7 +19,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 -GARCOMPILER = SOS12U3 +GARCOMPILER = GCC4 # SOS12U3 BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWgstreamer-dev @@ -296,6 +296,9 @@ EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +EXTRA_CONFIGURE_ENV = PATH=$(PATH):/opt/csw/gcc4/bin +EXTRA_BUILD_ENV = PATH=$(PATH):/opt/csw/gcc4/bin +EXTRA_INSTALL_ENV = PATH=$(PATH):/opt/csw/gcc4/bin STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 27 09:59:51 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Jun 2013 07:59:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[21401] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 21401 http://gar.svn.sourceforge.net/gar/?rev=21401&view=rev Author: cgrzemba Date: 2013-06-27 07:59:43 +0000 (Thu, 27 Jun 2013) Log Message: ----------- gstplugins/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-27 06:03:53 UTC (rev 21400) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-27 07:59:43 UTC (rev 21401) @@ -60,22 +60,14 @@ PACKAGES = CSWgstplugins CATALOGNAME = gstplugins SPKG_DESC_CSWgstplugins += $(DESCRIPTION), base -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibice -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWliboil RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstdataprotocol0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxext RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibsm -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibx11 -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibogg0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibxv -RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgconf2-4 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstbase0-10-0 @@ -92,19 +84,20 @@ RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstinterfaces0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstaudio0-10-0 RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgstapp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWgstplugins += CSWlibgcc-s1 PACKAGES += CSWlibgstapp0-10-0 CATALOGNAME_CSWlibgstapp0-10-0 = libgstapp0_10_0 PKGFILES_CSWlibgstapp0-10-0 += $(call baseisadirs,$(libdir),libgstapp-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstapp0-10-0 += $(call baseisadirs,$(libdir),libgstapp-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstapp0-10-0 += $(DESCRIPTION), libgstapp-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstapp0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstaudio0-10-0 @@ -112,14 +105,13 @@ PKGFILES_CSWlibgstaudio0-10-0 += $(call baseisadirs,$(libdir),libgstaudio-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstaudio0-10-0 += $(call baseisadirs,$(libdir),libgstaudio-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstaudio0-10-0 += $(DESCRIPTION), libgstaudio-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgstinterfaces0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgstaudio0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstcdda0-10-0 CATALOGNAME_CSWlibgstcdda0-10-0 = libgstcdda0_10_0 @@ -132,56 +124,49 @@ RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgsttag0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstfft0-10-0 CATALOGNAME_CSWlibgstfft0-10-0 = libgstfft0_10_0 PKGFILES_CSWlibgstfft0-10-0 += $(call baseisadirs,$(libdir),libgstfft-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstfft0-10-0 += $(call baseisadirs,$(libdir),libgstfft-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstfft0-10-0 += $(DESCRIPTION), libgstfft-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibgstreamer0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstfft0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstinterfaces0-10-0 CATALOGNAME_CSWlibgstinterfaces0-10-0 = libgstinterfaces0_10_0 PKGFILES_CSWlibgstinterfaces0-10-0 += $(call baseisadirs,$(libdir),libgstinterfaces-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstinterfaces0-10-0 += $(call baseisadirs,$(libdir),libgstinterfaces-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstinterfaces0-10-0 += $(DESCRIPTION), libgstinterfaces-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstinterfaces0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstnetbuffer0-10-0 CATALOGNAME_CSWlibgstnetbuffer0-10-0 = libgstnetbuffer0_10_0 PKGFILES_CSWlibgstnetbuffer0-10-0 += $(call baseisadirs,$(libdir),libgstnetbuffer-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstnetbuffer0-10-0 += $(call baseisadirs,$(libdir),libgstnetbuffer-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstnetbuffer0-10-0 += $(DESCRIPTION), libgstnetbuffer-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstnetbuffer0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstpbutils0-10-0 CATALOGNAME_CSWlibgstpbutils0-10-0 = libgstpbutils0_10_0 PKGFILES_CSWlibgstpbutils0-10-0 += $(call baseisadirs,$(libdir),libgstpbutils-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstpbutils0-10-0 += $(call baseisadirs,$(libdir),libgstpbutils-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstpbutils0-10-0 += $(DESCRIPTION), libgstpbutils-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWlibgstpbutils0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstriff0-10-0 CATALOGNAME_CSWlibgstriff0-10-0 = libgstriff0_10_0 @@ -189,27 +174,22 @@ PKGFILES_CSWlibgstriff0-10-0 += $(call baseisadirs,$(libdir),libgstriff-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstriff0-10-0 += $(DESCRIPTION), libgstriff-0.10.so.0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgstreamer0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgsttag0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgstaudio0-10-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstrtp0-10-0 CATALOGNAME_CSWlibgstrtp0-10-0 = libgstrtp0_10_0 PKGFILES_CSWlibgstrtp0-10-0 += $(call baseisadirs,$(libdir),libgstrtp-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstrtp0-10-0 += $(call baseisadirs,$(libdir),libgstrtp-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstrtp0-10-0 += $(DESCRIPTION), libgstrtp-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstrtp0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstrtsp0-10-0 CATALOGNAME_CSWlibgstrtsp0-10-0 = libgstrtsp0_10_0 @@ -221,45 +201,38 @@ RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstsdp0-10-0 CATALOGNAME_CSWlibgstsdp0-10-0 = libgstsdp0_10_0 PKGFILES_CSWlibgstsdp0-10-0 += $(call baseisadirs,$(libdir),libgstsdp-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstsdp0-10-0 += $(call baseisadirs,$(libdir),libgstsdp-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstsdp0-10-0 += $(DESCRIPTION), libgstsdp-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibgstreamer0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstsdp0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgsttag0-10-0 CATALOGNAME_CSWlibgsttag0-10-0 = libgsttag0_10_0 PKGFILES_CSWlibgsttag0-10-0 += $(call baseisadirs,$(libdir),libgsttag-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgsttag0-10-0 += $(call baseisadirs,$(libdir),libgsttag-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgsttag0-10-0 += $(DESCRIPTION), libgsttag-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsttag0-10-0 += CSWlibgcc-s1 PACKAGES += CSWlibgstvideo0-10-0 CATALOGNAME_CSWlibgstvideo0-10-0 = libgstvideo0_10_0 PKGFILES_CSWlibgstvideo0-10-0 += $(call baseisadirs,$(libdir),libgstvideo-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstvideo0-10-0 += $(call baseisadirs,$(libdir),libgstvideo-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstvideo0-10-0 += $(DESCRIPTION), libgstvideo-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgstvideo0-10-0 += CSWlibgcc-s1 PACKAGES += CSWgstplugins-dev CATALOGNAME_CSWgstplugins-dev = gstplugins_dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 27 10:41:55 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Jun 2013 08:41:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[21402] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: Revision: 21402 http://gar.svn.sourceforge.net/gar/?rev=21402&view=rev Author: cgrzemba Date: 2013-06-27 08:41:48 +0000 (Thu, 27 Jun 2013) Log Message: ----------- netsnmp/trunk: correct init file paths Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2013-06-27 07:59:43 UTC (rev 21401) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2013-06-27 08:41:48 UTC (rev 21402) @@ -38,8 +38,8 @@ BUILD_DEP_PKGS = CSWpysetuptools PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -INITSMF = /etc/init.d/snmpd -INITSMF = /etc/init.d/snmptrapd +INITSMF = $(sysconfdir)/init.d/snmpd +INITSMF += $(sysconfdir)/init.d/snmptrapd PACKAGES += CSWnetsnmp-dev CATALOGNAME_CSWnetsnmp-dev = netsnmp_dev @@ -64,7 +64,6 @@ SPKG_DESC_CSWlibnetsnmpagent25 += $(DESCRIPTION), libsnmpagent.so.25 PKGFILES_CSWlibnetsnmpagent25 += $(call baseisadirs,$(libdir),libnetsnmpagent\.so\.25(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibnetsnmpagent25 += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWlibnetsnmpagent25 += CSWlibssl1-0-0 PACKAGES += CSWlibnetsnmphelpers25 CATALOGNAME_CSWlibnetsnmphelpers25 = libnetsnmphelpers25 @@ -77,7 +76,6 @@ PKGFILES_CSWlibnetsnmpmibs25 += $(call baseisadirs,$(libdir),libnetsnmpmibs\.so\.25(\.\d+)*) RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibnetsnmpagent25 -RUNTIME_DEP_PKGS_CSWlibnetsnmpmibs25 += CSWlibssl1-0-0 PACKAGES += CSWlibnetsnmptrapd25 CATALOGNAME_CSWlibnetsnmptrapd25 = libnetsnmptrapd25 @@ -86,19 +84,16 @@ RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpmibs25 RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibnetsnmpagent25 -RUNTIME_DEP_PKGS_CSWlibnetsnmptrapd25 += CSWlibssl1-0-0 EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal.pod PACKAGES += CSWpmnetsnmp SPKG_DESC_CSWpmnetsnmp+= $(DESCRIPTION), Perl binding PKGFILES_CSWpmnetsnmp += $(libdir)/perl.* RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWperl -RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpmibs25 +# RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpmibs25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmptrapd25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmp25 RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibnetsnmpagent25 -# CHECKPKG_OVERRIDES_CSWpmnetsnmp += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/site_perl/NetSNMP/TrapReceiver.pm -RUNTIME_DEP_PKGS_CSWpmnetsnmp += CSWlibssl1-0-0 EXTRA_MERGE_EXCLUDE_FILES += .*/*.pyc PACKAGES += CSWpy-netsnmp @@ -108,7 +103,6 @@ RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWpython RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibnetsnmp25 -RUNTIME_DEP_PKGS_CSWpy-netsnmp += CSWlibssl1-0-0 PACKAGES += CSWnetsnmp SPKG_DESC_CSWnetsnmp += $(DESCRIPTION), Base @@ -202,11 +196,11 @@ # LDFLAGS := $(filter-out -R/opt/csw/lib% -L/opt/csw/lib,$(LDFLAGS)) post-install: - ginstall -d $(DESTDIR)/etc/init.d - ginstall -d $(DESTDIR)/$(syconfdir)/snmp - ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/etc/init.d/snmpd - ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/etc/init.d/snmptrapd - ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(syconfdir)/snmp/snmpd + ginstall -d $(DESTDIR)/$(sysconfdir)/init.d + ginstall -d $(DESTDIR)/$(sysconfdir)/snmp + ginstall -m 755 $(WORKSRC)/dist/snmpd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmpd + ginstall -m 755 $(WORKSRC)/dist/snmptrapd-init.d $(DESTDIR)/$(sysconfdir)/init.d/snmptrapd + ginstall -m 755 $(WORKSRC)/EXAMPLE.conf $(DESTDIR)/$(sysconfdir)/snmp/snmpd @$(MAKECOOKIE) #post-install-isa-sparcv8: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 27 10:48:18 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Jun 2013 08:48:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[21403] csw/mgar/pkg/gstplugins/trunk/Makefile Message-ID: Revision: 21403 http://gar.svn.sourceforge.net/gar/?rev=21403&view=rev Author: cgrzemba Date: 2013-06-27 08:48:18 +0000 (Thu, 27 Jun 2013) Log Message: ----------- gstplugins/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/gstplugins/trunk/Makefile Modified: csw/mgar/pkg/gstplugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-27 08:41:48 UTC (rev 21402) +++ csw/mgar/pkg/gstplugins/trunk/Makefile 2013-06-27 08:48:18 UTC (rev 21403) @@ -118,9 +118,7 @@ PKGFILES_CSWlibgstcdda0-10-0 += $(call baseisadirs,$(libdir),libgstcdda-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstcdda0-10-0 += $(call baseisadirs,$(libdir),libgstcdda-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstcdda0-10-0 += $(DESCRIPTION), libgstcdda-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgstbase0-10-0 -RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstcdda0-10-0 += CSWlibgsttag0-10-0 @@ -173,7 +171,6 @@ PKGFILES_CSWlibgstriff0-10-0 += $(call baseisadirs,$(libdir),libgstriff-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstriff0-10-0 += $(call baseisadirs,$(libdir),libgstriff-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstriff0-10-0 += $(DESCRIPTION), libgstriff-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgsttag0-10-0 RUNTIME_DEP_PKGS_CSWlibgstriff0-10-0 += CSWlibgstaudio0-10-0 @@ -196,8 +193,6 @@ PKGFILES_CSWlibgstrtsp0-10-0 += $(call baseisadirs,$(libdir),libgstrtsp-0\.10\.so\.0\.20\.0) PKGFILES_CSWlibgstrtsp0-10-0 += $(call baseisadirs,$(libdir),libgstrtsp-0\.10\.so\.0(\.\d+)*) SPKG_DESC_CSWlibgstrtsp0-10-0 += $(DESCRIPTION), libgstrtsp-0.10.so.0 -RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgstreamer0-10-0 RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgstrtsp0-10-0 += CSWlibglib2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 27 14:59:25 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 27 Jun 2013 12:59:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[21404] csw/mgar/pkg/gstplugins_good/trunk Message-ID: Revision: 21404 http://gar.svn.sourceforge.net/gar/?rev=21404&view=rev Author: cgrzemba Date: 2013-06-27 12:59:21 +0000 (Thu, 27 Jun 2013) Log Message: ----------- gstplugins_good/trunk: version update 0.10.28 Modified Paths: -------------- csw/mgar/pkg/gstplugins_good/trunk/Makefile csw/mgar/pkg/gstplugins_good/trunk/checksums Modified: csw/mgar/pkg/gstplugins_good/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/Makefile 2013-06-27 08:48:18 UTC (rev 21403) +++ csw/mgar/pkg/gstplugins_good/trunk/Makefile 2013-06-27 12:59:21 UTC (rev 21404) @@ -1,5 +1,5 @@ NAME = gst-plugins-good -VERSION = 0.10.18 +VERSION = 0.10.28 CATEGORIES = gnome GARTYPE = v2 @@ -14,49 +14,92 @@ MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-good/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWgstpluginsgood +PACKAGES = CSWgstplugins-good CATALOGNAME = gstplugins_good # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -DEP_PKGS += CSWzlib CSWspeex CSWpng CSWlibice CSWlibx11 CSWgtk2 CSWvorbis -DEP_PKGS += CSWlibxml2 CSWliboil CSWlibcairo CSWjpeg CSWglib2 CSWgconf2 -DEP_PKGS += CSWgstreamer CSWgstplugins CSWflac CSWesound CSWbzip2 CSWlibsm -DEP_PKGS += CSWggettextrt CSWlibogg CSWlibshout CSWtheora CSWlibxext +GARCOMPILER = GCC4 +PACKAGING_PLATFORMS += Solaris10-sparc Solaris10-i386 +BUILD_DEP_PKGS += CSWgstreamer-dev CSWgstplugins-dev CSWlibflac-dev CSWesound +BUILD_DEP_PKGS += CSWlibsmdevel CSWlibesd-dev CSWtaglib-devel CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibaudiofile-dev CSWlibjpeg-dev + +PACKAGES = CSWgstplugins-good +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstsdp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstriff0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstinterfaces0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstrtp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstnetbuffer0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibx11 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibsoup-gnome2-4-1 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgsttag0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstrtsp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstfft0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstpbutils0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstaudio0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibesd0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstbase0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibxext +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibflac8 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgstcontroller0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgstplugins-good += CSWlibsoup2-4-1 + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +CONFIGURE_ARGS += --disable-silent-rules EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig - STRIP_LIBTOOL = 1 TEST_SCRIPTS = -PATCHFILES = patch-matroska-demux.c +# PATCHFILES = patch-matroska-demux.c +# EXTRA_CFLAGS = -UHAVE_GCC_ASM +BUILD_ARGS = CCAS=gcc + include gar/category.mk -post-configure-modulated: - @# we do not have a hyperbolic tangent float function on solaris8, - @# using hyperbolic tangent double instead - perl -pi -e 's,tanhf,tanh,' \ - $(WORKSRC)/gst/replaygain/gstrglimiter.c - @# [bus_message_cb]:ube: error: SIGNAL: Segmentation Fault - @# <@Dagobert> Yes, try lowering the optimizer level from -xO3 down to - @# -xO2 and may further down. - perl -pi -e 's,xO3,xO1,' $(WORKSRC)/tests/icles/Makefile - gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ - $(WORKSRC)/tests/examples/equalizer/Makefile - gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ - $(WORKSRC)/tests/examples/spectrum/Makefile - gsed -i 's/\(demo_osssrc_LDFLAGS =\)/\1 $$(X_LIBS)/' \ - $(WORKSRC)/tests/examples/spectrum/Makefile - gsed -i 's/\(demo_audiotest_LDFLAGS =\)/\1 $$(X_LIBS)/' \ - $(WORKSRC)/tests/examples/spectrum/Makefile - gsed -i 's/\(spectrum_example_LDFLAGS =\)/\1 $$(X_LIBS)/' \ - $(WORKSRC)/tests/examples/spectrum/Makefile + +# post-configure-modulated: +# @# we do not have a hyperbolic tangent float function on solaris8, +# @# using hyperbolic tangent double instead +# perl -pi -e 's,tanhf,tanh,' \ +# $(WORKSRC)/gst/replaygain/gstrglimiter.c +# @# [bus_message_cb]:ube: error: SIGNAL: Segmentation Fault +# @# <@Dagobert> Yes, try lowering the optimizer level from -xO3 down to +# @# -xO2 and may further down. +# perl -pi -e 's,xO3,xO1,' $(WORKSRC)/tests/icles/Makefile +# gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ +# $(WORKSRC)/tests/examples/equalizer/Makefile +# gsed -i 's/\(demo_LDFLAGS =\)/\1 $$(X_LIBS)/' \ +# $(WORKSRC)/tests/examples/spectrum/Makefile +# gsed -i 's/\(demo_osssrc_LDFLAGS =\)/\1 $$(X_LIBS)/' \ +# $(WORKSRC)/tests/examples/spectrum/Makefile +# gsed -i 's/\(demo_audiotest_LDFLAGS =\)/\1 $$(X_LIBS)/' \ +# $(WORKSRC)/tests/examples/spectrum/Makefile +# gsed -i 's/\(spectrum_example_LDFLAGS =\)/\1 $$(X_LIBS)/' \ +# $(WORKSRC)/tests/examples/spectrum/Makefile + +PATH := $(PATH):/opt/csw/gcc4/bin/ Modified: csw/mgar/pkg/gstplugins_good/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_good/trunk/checksums 2013-06-27 08:48:18 UTC (rev 21403) +++ csw/mgar/pkg/gstplugins_good/trunk/checksums 2013-06-27 12:59:21 UTC (rev 21404) @@ -1,2 +1 @@ -5631add1ae2d4f5db0a3358cb4056002 gst-plugins-good-0.10.18.tar.gz -c26dd91683972189df36b4f15a1d6e31 patch-matroska-demux.c +f7217926c344f5aa18a6521b36098800 gst-plugins-good-0.10.28.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 Thu Jun 27 21:13:30 2013 From: slowfranklin at users.sourceforge.net (slowfranklin at users.sourceforge.net) Date: Thu, 27 Jun 2013 19:13:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[21405] csw/mgar/pkg/tracker/trunk/Makefile Message-ID: Revision: 21405 http://gar.svn.sourceforge.net/gar/?rev=21405&view=rev Author: slowfranklin Date: 2013-06-27 19:13:29 +0000 (Thu, 27 Jun 2013) Log Message: ----------- tracker/trunk: Disable libexempi, it pulls in stlport Modified Paths: -------------- csw/mgar/pkg/tracker/trunk/Makefile Modified: csw/mgar/pkg/tracker/trunk/Makefile =================================================================== --- csw/mgar/pkg/tracker/trunk/Makefile 2013-06-27 12:59:21 UTC (rev 21404) +++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-27 19:13:29 UTC (rev 21405) @@ -40,7 +40,7 @@ BUILD_DEP_PKGS += CSWlibuuid-dev BUILD_DEP_PKGS += CSWlibiptcdata BUILD_DEP_PKGS += CSWpoppler-dev -BUILD_DEP_PKGS += CSWexempidevel +# BUILD_DEP_PKGS += CSWexempidevel BUILD_DEP_PKGS += CSWgstreamer BUILD_DEP_PKGS += CSWlibexif-dev @@ -52,7 +52,7 @@ RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWtracker += CSWexempi +# RUNTIME_DEP_PKGS_CSWtracker += CSWexempi RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0 RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0 @@ -81,7 +81,7 @@ RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibiptcdata RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibpoppler-glib8 -RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWexempi +# RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWexempi RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWgstreamer RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0 RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-common @@ -157,6 +157,9 @@ CONFIGURE_ARGS += --disable-introspection CONFIGURE_ARGS += --disable-playlist CONFIGURE_ARGS += --disable-nautilus-extension +# exempi links with stlport while glib links with libCstd, both at once are incomp. +# and both would be linked at once in libtracker-extract, so we have to disable it +CONFIGURE_ARGS += --disable-exempi include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 28 09:53:42 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 28 Jun 2013 07:53:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[21406] csw/mgar/pkg/gstplugins_ugly/trunk Message-ID: Revision: 21406 http://gar.svn.sourceforge.net/gar/?rev=21406&view=rev Author: cgrzemba Date: 2013-06-28 07:53:36 +0000 (Fri, 28 Jun 2013) Log Message: ----------- gstplugins_ugly/trunk: update version Modified Paths: -------------- csw/mgar/pkg/gstplugins_ugly/trunk/Makefile csw/mgar/pkg/gstplugins_ugly/trunk/checksums Modified: csw/mgar/pkg/gstplugins_ugly/trunk/Makefile =================================================================== --- csw/mgar/pkg/gstplugins_ugly/trunk/Makefile 2013-06-27 19:13:29 UTC (rev 21405) +++ csw/mgar/pkg/gstplugins_ugly/trunk/Makefile 2013-06-28 07:53:36 UTC (rev 21406) @@ -1,5 +1,5 @@ NAME = gst-plugins-ugly -VERSION = 0.10.13 +VERSION = 0.10.17 CATEGORIES = gnome GARTYPE = v2 @@ -13,21 +13,48 @@ MASTER_SITES = http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWgstpluginsugly -CATALOGNAME = gstplugins_ugly -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWgstreamer-dev +BUILD_DEP_PKGS += CSWgstplugins-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWlibdvdread-dev +BUILD_DEP_PKGS += CSWlibid3tag +BUILD_DEP_PKGS += CSWlibmad-dev +BUILD_DEP_PKGS += CSWliboil +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWsunmath +BUILD_DEP_PKGS += CSWzlib +BUILD_DEP_PKGS += CSWliba52 -BUILD_DEP_PKGS += CSWgstreamer CSWgstplugins CSWglib2 CSWggettext CSWggettextrt -BUILD_DEP_PKGS += CSWlibdvdread CSWlibid3tag CSWlibmad CSWliboil CSWlibxml2 -BUILD_DEP_PKGS += CSWsunmath CSWzlib CSWliba52 -RUNTIME_DEP_PKGS = $(BUILD_DEP_PKGS) +GARCOMPILER = GCC4 +PACKAGES = CSWgstplugins-ugly +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstrtp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstsdp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstbase0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibid3tag +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibdvdread4 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWliba52 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstreamer0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstaudio0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstpbutils0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstriff0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibmad0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgsttag0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstrtsp0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibgstvideo0-10-0 +RUNTIME_DEP_PKGS_CSWgstplugins-ugly += CSWlibglib2-0-0 + CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --disable-debug -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) +# CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include +# CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib/$(MM_LIBDIR) EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) Modified: csw/mgar/pkg/gstplugins_ugly/trunk/checksums =================================================================== --- csw/mgar/pkg/gstplugins_ugly/trunk/checksums 2013-06-27 19:13:29 UTC (rev 21405) +++ csw/mgar/pkg/gstplugins_ugly/trunk/checksums 2013-06-28 07:53:36 UTC (rev 21406) @@ -1 +1 @@ -abf125b9a3c0432721493bc49d7a04c8 gst-plugins-ugly-0.10.13.tar.gz +7df1fb46ce2403426d98cc9db773a31a gst-plugins-ugly-0.10.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 28 12:43:08 2013 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 28 Jun 2013 10:43:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[21407] csw/mgar/pkg Message-ID: Revision: 21407 http://gar.svn.sourceforge.net/gar/?rev=21407&view=rev Author: cgrzemba Date: 2013-06-28 10:43:01 +0000 (Fri, 28 Jun 2013) Log Message: ----------- json-c/trunk: initial commit Added Paths: ----------- csw/mgar/pkg/json-c/ csw/mgar/pkg/json-c/Makefile csw/mgar/pkg/json-c/branches/ csw/mgar/pkg/json-c/tags/ csw/mgar/pkg/json-c/trunk/ csw/mgar/pkg/json-c/trunk/Makefile csw/mgar/pkg/json-c/trunk/checksums csw/mgar/pkg/json-c/trunk/files/ csw/mgar/pkg/json-c/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch Added: csw/mgar/pkg/json-c/Makefile =================================================================== --- csw/mgar/pkg/json-c/Makefile (rev 0) +++ csw/mgar/pkg/json-c/Makefile 2013-06-28 10:43:01 UTC (rev 21407) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/json-c/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/json-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/json-c/trunk/Makefile (rev 0) +++ csw/mgar/pkg/json-c/trunk/Makefile 2013-06-28 10:43:01 UTC (rev 21407) @@ -0,0 +1,46 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = json-c +VERSION = 0.10 +GARTYPE = v2 + +DESCRIPTION = JSON objects in C +define BLURB + JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. +endef + +MASTER_SITES = https://s3.amazonaws.com/json-c_releases/releases/ +# GIT_REPOS = git://github.com/json-c/json-c.git + +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GCC4 + +PATCHFILES = 0001-allow-to-use-public-vasprintf-symbol.patch + +PACKAGES += CSWlibjson0 +CATALOGNAME_CSWlibjson0 = libjson0 +PKGFILES_CSWlibjson0 += $(call baseisadirs,$(libdir),libjson\.so\.0\.1\.0) +PKGFILES_CSWlibjson0 += $(call baseisadirs,$(libdir),libjson\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibjson0 += $(DESCRIPTION), libjson.so.0 +RUNTIME_DEP_PKGS_CSWlibjson0 += CSWlibgcc-s1 + +PACKAGES += CSWjson-c-dev +CATALOGNAME_CSWjson-c-dev = json_c_dev +SPKG_DESC_CSWjson-c-dev += $(DESCRIPTION), development files +PKGFILES_CSWjson-c-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWjson-c-dev += CSWlibjson0 + +# vasprintf test failes with: +# symbol belongs to unavailable version /lib/libc.so (SUNW_1.22.7) +# EXTRA_CONFIGURE_ENV = LD_OPTIONS= + +# EXTRA_CFLAGS = -xnorunpath + +SKIPTEST = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/json-c/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/json-c/trunk/checksums =================================================================== --- csw/mgar/pkg/json-c/trunk/checksums (rev 0) +++ csw/mgar/pkg/json-c/trunk/checksums 2013-06-28 10:43:01 UTC (rev 21407) @@ -0,0 +1 @@ +a4edc79410eb894f08d7d52ca9f88732 json-c-0.10.tar.gz Added: csw/mgar/pkg/json-c/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch =================================================================== --- csw/mgar/pkg/json-c/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch (rev 0) +++ csw/mgar/pkg/json-c/trunk/files/0001-allow-to-use-public-vasprintf-symbol.patch 2013-06-28 10:43:01 UTC (rev 21407) @@ -0,0 +1,25 @@ +From c73861996d5b4bb9202c42aa2d6700f11b3026b3 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Fri, 28 Jun 2013 12:33:28 +0200 +Subject: [PATCH] allow to use publiv vasprintf symbol + +--- + printbuf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/printbuf.c b/printbuf.c +index b951c7b..50fe208 100644 +--- a/printbuf.c ++++ b/printbuf.c +@@ -116,7 +116,7 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len) + + #if !HAVE_VASPRINTF + /* CAW: compliant version of vasprintf */ +-static int vasprintf(char **buf, const char *fmt, va_list ap) ++int vasprintf(char **buf, const char *fmt, va_list ap) + { + #ifndef WIN32 + static char _T_emptybuffer = '\0'; +-- +1.8.3.1 + 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 Jun 28 23:07:11 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 28 Jun 2013 21:07:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21408] csw/mgar/pkg/bonnie++/trunk Message-ID: Revision: 21408 http://gar.svn.sourceforge.net/gar/?rev=21408&view=rev Author: lblume Date: 2013-06-28 21:07:05 +0000 (Fri, 28 Jun 2013) Log Message: ----------- bonnie++/trunk: Add 64 bit support wit a patch to propagate the needed LDFLAGS Modified Paths: -------------- csw/mgar/pkg/bonnie++/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/bonnie++/trunk/files/0001-ld-needs-flags.patch Modified: csw/mgar/pkg/bonnie++/trunk/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 10:43:01 UTC (rev 21407) +++ csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 21:07:05 UTC (rev 21408) @@ -16,6 +16,8 @@ MASTER_SITES = http://www.coker.com.au/bonnie++/experimental/ DISTFILES = $(NAME)-$(FILEVERSION).tgz +PATCHFILES += 0001-ld-needs-flags.patch + PACKAGES = CSWbonnie++ CATALOGNAME_CSWbonnie++ = bonnie++ SPKG_DESC_CSWbonnie++ = A benchmark suite testing hard drive and file system performance @@ -26,7 +28,11 @@ CONFIGURE_ARGS = $(DIRPATHS) +BUILD64 = 1 +ISAEXEC = 1 + TEST_TARGET = +BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom include gar/category.mk @@ -38,6 +44,11 @@ MAN1FILES = bon_csv2html.1 bon_csv2txt.1 generate_randfile.1 MAN8FILES = bonnie++.8 zcav.8 getc_putc.8 +build-custom: + @echo " => Building $(CATALOGNAME)" + cd $(WORKSRC) && $(MAKE) MORECFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" + @$(MAKECOOKIE) + install-custom: @echo " => Installing $(CATALOGNAME)" ginstall -d $(DESTDIR)$(bindir) Added: csw/mgar/pkg/bonnie++/trunk/files/0001-ld-needs-flags.patch =================================================================== --- csw/mgar/pkg/bonnie++/trunk/files/0001-ld-needs-flags.patch (rev 0) +++ csw/mgar/pkg/bonnie++/trunk/files/0001-ld-needs-flags.patch 2013-06-28 21:07:05 UTC (rev 21408) @@ -0,0 +1,11 @@ +--- a/Makefile.in Tue Dec 30 22:04:25 2008 ++++ b/Makefile.in Thu Jun 27 00:14:39 2013 +@@ -11,7 +11,7 @@ + WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) + CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) + CXX=@CXX@ $(CFLAGS) +-LINK=@CXX@ ++LINK=@CXX@ $(LDFLAGS) + THREAD_LFLAGS=@thread_ldflags@ + + INSTALL=@INSTALL@ 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 Jun 28 23:24:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 28 Jun 2013 21:24:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21409] csw/mgar/pkg/bonnie++/trunk/Makefile Message-ID: Revision: 21409 http://gar.svn.sourceforge.net/gar/?rev=21409&view=rev Author: lblume Date: 2013-06-28 21:24:37 +0000 (Fri, 28 Jun 2013) Log Message: ----------- bonnie++/trunk: Add lazyload Modified Paths: -------------- csw/mgar/pkg/bonnie++/trunk/Makefile Modified: csw/mgar/pkg/bonnie++/trunk/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 21:07:05 UTC (rev 21408) +++ csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 21:24:37 UTC (rev 21409) @@ -31,6 +31,8 @@ BUILD64 = 1 ISAEXEC = 1 +EXTRA_CXXFLAGS += -Wl,-z,lazyload + TEST_TARGET = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom 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 Jun 29 00:32:34 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 28 Jun 2013 22:32:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[21410] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21410 http://gar.svn.sourceforge.net/gar/?rev=21410&view=rev Author: lblume Date: 2013-06-28 22:32:30 +0000 (Fri, 28 Jun 2013) Log Message: ----------- samba/branches/samba3: Add patch to sort groups; Add patch to name nss_winbind Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Added Paths: ----------- csw/mgar/pkg/samba/branches/samba3/files/0001-nss_winbind.patch csw/mgar/pkg/samba/branches/samba3/files/0002-smbd-patch-for-setgroups.c.patch csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-28 21:24:37 UTC (rev 21409) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-28 22:32:30 UTC (rev 21410) @@ -24,6 +24,10 @@ # This is taken from the old Samba package DISTFILES += cswkrb5.conf +PATCHFILE += 0001-nss_winbind.patch +PATCHFILE += 0002-smbd-patch-for-setgroups.c.patch +PATCHFILE += 0003-rename-nss-modules.patch + GARCOMPILER=SOS12U3 #What needs to be fixed: Added: csw/mgar/pkg/samba/branches/samba3/files/0001-nss_winbind.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/0001-nss_winbind.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba3/files/0001-nss_winbind.patch 2013-06-28 22:32:30 UTC (rev 21410) @@ -0,0 +1,32 @@ +--- a/nsswitch/winbind_nss_linux.c Wed Jun 19 09:35:24 2013 ++++ b/nsswitch/winbind_nss_linux.c Sun Jun 23 13:14:43 2013 +@@ -25,6 +25,8 @@ + #include + #endif + ++#include "lib/util/tsort.h" ++ + #if HAVE_PTHREAD + static pthread_mutex_t winbind_nss_mutex = PTHREAD_MUTEX_INITIALIZER; + #endif +@@ -1044,6 +1046,11 @@ + + /* Initialise supplementary groups */ + ++static int gid_compare(void *gid_1, void *gid_2) ++{ ++ return (*(gid_t *)gid_1 - *(gid_t *)gid_2); ++} ++ + NSS_STATUS + _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start, + long int *size, gid_t **groups, long int limit, +@@ -1075,6 +1082,8 @@ + int num_gids = response.data.num_entries; + gid_t *gid_list = (gid_t *)response.extra_data.data; + ++ TYPESAFE_QSORT(gid_list, num_gids, gid_compare); ++ + #ifdef DEBUG_NSS + fprintf(stderr, "[%5d]: initgroups %s: got NSS_STATUS_SUCCESS " + "and %d gids\n", getpid(), Added: csw/mgar/pkg/samba/branches/samba3/files/0002-smbd-patch-for-setgroups.c.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/0002-smbd-patch-for-setgroups.c.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba3/files/0002-smbd-patch-for-setgroups.c.patch 2013-06-28 22:32:30 UTC (rev 21410) @@ -0,0 +1,65 @@ +--- a/source3/lib/system.c Wed Jun 19 09:35:24 2013 ++++ b/source3/lib/system.c Sun Jun 23 13:16:17 2013 +@@ -1172,8 +1172,6 @@ + returning an array of gid_t, but actuall return an array of int. + ****************************************************************************/ + +-#if defined(HAVE_BROKEN_GETGROUPS) +- + #ifdef HAVE_BROKEN_GETGROUPS + #define GID_T int + #else +@@ -1180,6 +1178,8 @@ + #define GID_T gid_t + #endif + ++#if defined(HAVE_BROKEN_GETGROUPS) ++ + static int sys_broken_getgroups(int setlen, gid_t *gidset) + { + GID_T gid; +@@ -1222,6 +1222,13 @@ + return ngroups; + } + ++#endif /* HAVE_BROKEN_GETGROUPS */ ++ ++static int gid_compare(void *gid_1, void *gid_2) ++{ ++ return (*(GID_T *)gid_1 - *(GID_T *)gid_2); ++} ++ + static int sys_broken_setgroups(int setlen, gid_t *gidset) + { + GID_T *group_list; +@@ -1248,6 +1255,8 @@ + for(i = 0; i < setlen; i++) + group_list[i] = (GID_T) gidset[i]; + ++ TYPESAFE_QSORT(group_list, setlen, gid_compare); ++ + if(setgroups(setlen, group_list) != 0) { + int saved_errno = errno; + SAFE_FREE(group_list); +@@ -1259,8 +1268,6 @@ + return 0 ; + } + +-#endif /* HAVE_BROKEN_GETGROUPS */ +- + /* This is a list of systems that require the first GID passed to setgroups(2) + * to be the effective GID. If your system is one of these, add it here. + */ +@@ -1351,11 +1358,8 @@ + + #if defined(USE_BSD_SETGROUPS) + return sys_bsd_setgroups(primary_gid, setlen, gidset); +-#elif defined(HAVE_BROKEN_GETGROUPS) +- return sys_broken_setgroups(setlen, gidset); +-#else +- return setgroups(setlen, gidset); + #endif ++ return sys_broken_setgroups(setlen, gidset); + } + + /************************************************************************** Added: csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch 2013-06-28 22:32:30 UTC (rev 21410) @@ -0,0 +1,22 @@ +--- a/source3/configure Thu Jun 27 14:04:05 2013 ++++ b/source3/configure Fri Jun 28 23:36:35 2013 +@@ -36081,6 +36081,8 @@ + NSSSONAMEVERSIONSUFFIX=".1" + WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o \ + ../nsswitch/winbind_nss_linux.o" ++ WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" ++ WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" + ;; + *hpux11*) + WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o" +--- a/source3/configure.in Wed Jun 19 09:35:24 2013 ++++ b/source3/configure.in Fri Jun 28 23:35:21 2013 +@@ -6403,6 +6403,8 @@ + NSSSONAMEVERSIONSUFFIX=".1" + WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o \ + ../nsswitch/winbind_nss_linux.o" ++ WINBIND_NSS="../nsswitch/nss_winbind.$SHLIBEXT" ++ WINBIND_WINS_NSS="../nsswitch/nss_wins.$SHLIBEXT" + ;; + *hpux11*) + WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.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 Sat Jun 29 00:39:11 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 28 Jun 2013 22:39:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[21411] csw/mgar/pkg/bonnie++/trunk/Makefile Message-ID: Revision: 21411 http://gar.svn.sourceforge.net/gar/?rev=21411&view=rev Author: lblume Date: 2013-06-28 22:39:11 +0000 (Fri, 28 Jun 2013) Log Message: ----------- bonnie++/trunk: Add override Modified Paths: -------------- csw/mgar/pkg/bonnie++/trunk/Makefile Modified: csw/mgar/pkg/bonnie++/trunk/Makefile =================================================================== --- csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 22:32:30 UTC (rev 21410) +++ csw/mgar/pkg/bonnie++/trunk/Makefile 2013-06-28 22:39:11 UTC (rev 21411) @@ -24,6 +24,9 @@ RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWbonnie++ += CSWlibstdc++6 +# Can't seem to find a way around those errors with g++ as a linker +CHECKPKG_OVERRIDES_CSWbonnie++ += no-direct-binding + LICENSE = copyright.txt CONFIGURE_ARGS = $(DIRPATHS) @@ -31,7 +34,7 @@ BUILD64 = 1 ISAEXEC = 1 -EXTRA_CXXFLAGS += -Wl,-z,lazyload +EXTRA_CXXFLAGS += -std=gnu++11 TEST_TARGET = BUILD_SCRIPTS = custom 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 Jun 29 13:53:37 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 29 Jun 2013 11:53:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[21412] csw/mgar/pkg/samba/branches/samba3 Message-ID: Revision: 21412 http://gar.svn.sourceforge.net/gar/?rev=21412&view=rev Author: lblume Date: 2013-06-29 11:53:32 +0000 (Sat, 29 Jun 2013) Log Message: ----------- samba/branches/samba3: Typo in recipe; additional bits of renaming for nss_winbind.so.1 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-28 22:39:11 UTC (rev 21411) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 11:53:32 UTC (rev 21412) @@ -24,9 +24,9 @@ # This is taken from the old Samba package DISTFILES += cswkrb5.conf -PATCHFILE += 0001-nss_winbind.patch -PATCHFILE += 0002-smbd-patch-for-setgroups.c.patch -PATCHFILE += 0003-rename-nss-modules.patch +PATCHFILES += 0001-nss_winbind.patch +PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch +PATCHFILES += 0003-rename-nss-modules.patch GARCOMPILER=SOS12U3 @@ -150,10 +150,11 @@ PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 -PACKAGES += CSWlibnss-winbind1 -CATALOGNAME_CSWlibnss-winbind1 = libnss_winbind1 -PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1) -SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1 +PACKAGES += CSWnss-winbind1 +CATALOGNAME_CSWnss-winbind1 = nss_winbind1 +PKGFILES_CSWnss-winbind1 += $(call pkgfiles_lib,nss_winbind.so.1) +SPKG_DESC_CSWnss-winbind1 += Winbind nss libary,nss_winbind.so.1 +OBSOLETED_BY_CSWnss-winbind1 += CSWlibnss-winbind1 PACKAGES += CSWlibtevent0 CATALOGNAME_CSWlibtevent0 = libtevent0 @@ -263,13 +264,13 @@ RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibnss-winbind1 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWnss-winbind1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtevent0 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb -CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWlibnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWnss-winbind1 # Needed as the configure script doesn't add it EXTRA_LINKER_FLAGS += -lintl @@ -352,4 +353,4 @@ ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind ginstall -d $(DESTDIR)/etc/opt/csw/samba ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf - ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1 + ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1 Modified: csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch 2013-06-28 22:39:11 UTC (rev 21411) +++ csw/mgar/pkg/samba/branches/samba3/files/0003-rename-nss-modules.patch 2013-06-29 11:53:32 UTC (rev 21412) @@ -20,3 +20,14 @@ ;; *hpux11*) WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_solaris.o" +--- a/source3/Makefile.in Wed Jun 19 09:35:24 2013 ++++ b/source3/Makefile.in Sat Jun 29 13:30:23 2013 +@@ -3578,7 +3578,7 @@ + test:: all torture timelimit + @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \ + SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \ +- NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \ ++ NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/nss_winbind.so" \ + SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \ + SOURCEDIR="$(srcdir)" \ + VFSLIBDIR="$(builddir)/bin" \ 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 Jun 29 15:43:09 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 29 Jun 2013 13:43:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[21413] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21413 http://gar.svn.sourceforge.net/gar/?rev=21413&view=rev Author: lblume Date: 2013-06-29 13:43:02 +0000 (Sat, 29 Jun 2013) Log Message: ----------- samba/branches/samba3: Rename a package to be specialized for Samba NSS modules; Create a package to add them to the system Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 11:53:32 UTC (rev 21412) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 13:43:02 UTC (rev 21413) @@ -150,12 +150,20 @@ PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1) SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1 -PACKAGES += CSWnss-winbind1 -CATALOGNAME_CSWnss-winbind1 = nss_winbind1 -PKGFILES_CSWnss-winbind1 += $(call pkgfiles_lib,nss_winbind.so.1) -SPKG_DESC_CSWnss-winbind1 += Winbind nss libary,nss_winbind.so.1 -OBSOLETED_BY_CSWnss-winbind1 += CSWlibnss-winbind1 +PACKAGES += CSWsamba-nss +CATALOGNAME_CSWsamba-nss = samba_nss +PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_winbind.so.1) +PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_wins.so.1) +SPKG_DESC_CSWsamba-nss += Samba nss modules,nss_winbind.so.1,nss_wins.so.1 +OBSOLETED_BY_CSWsamba-nss += CSWlibnss-winbind1 +PACKAGES += CSWsamba-nss-system-links +CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links +PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_winbind_csw\.so\.1) +PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_wins_csw\.so\.1) +SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system +RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss + PACKAGES += CSWlibtevent0 CATALOGNAME_CSWlibtevent0 = libtevent0 PKGFILES_CSWlibtevent0 += $(call baseisadirs,$(libdir),libtevent\.so\.0(\.\d+)*) @@ -264,13 +272,13 @@ RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWnss-winbind1 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWsamba-nss RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtevent0 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb -CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWsamba-nss # Needed as the configure script doesn't add it EXTRA_LINKER_FLAGS += -lintl @@ -354,3 +362,20 @@ ginstall -d $(DESTDIR)/etc/opt/csw/samba ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1 + ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1 + # This bit is to install the symlinks to use the NSS modules with the + # system's nsswitch.conf + if [ "$(MEMORYMODEL)" = "32" ]; then \ + ginstall -d $(DESTDIR)/usr/lib; \ + ln -s ../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \ + $(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \ + ln -s ../../opt/csw/lib/nss_wins.so.1 \ + $(DESTDIR)/usr/lib/nss_wins_csw.so.1; \ + fi + if [ "$(MEMORYMODEL)" = "64" ]; then \ + ginstall -d $(DESTDIR)/usr/lib/$(MEMORYMODEL); \ + ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \ + $(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_winbind_csw.so.1; \ + ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_wins.so.1 \ + $(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_wins_csw.so.1; \ + fi 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 Jun 30 01:17:39 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 29 Jun 2013 23:17:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[21414] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21414 http://gar.svn.sourceforge.net/gar/?rev=21414&view=rev Author: lblume Date: 2013-06-29 23:17:38 +0000 (Sat, 29 Jun 2013) Log Message: ----------- samba/branches/samba3: Add missing dependencies; clean up file selection a bit; add overrides for all the evil things I've done Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 13:43:02 UTC (rev 21413) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 23:17:38 UTC (rev 21414) @@ -152,17 +152,28 @@ PACKAGES += CSWsamba-nss CATALOGNAME_CSWsamba-nss = samba_nss -PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_winbind.so.1) -PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_wins.so.1) +PKGFILES_CSWsamba-nss += $(call baseisadirs,$(libdir),nss_winbind\.so\.1) +PKGFILES_CSWsamba-nss += $(call baseisadirs,$(libdir),nss_wins\.so\.1) SPKG_DESC_CSWsamba-nss += Samba nss modules,nss_winbind.so.1,nss_wins.so.1 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtevent0 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtdb1 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibtalloc2 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibldap2-4-2 OBSOLETED_BY_CSWsamba-nss += CSWlibnss-winbind1 +CHECKPKG_OVERRIDES_CSWsamba-nss += shared-lib-pkgname-mismatch PACKAGES += CSWsamba-nss-system-links CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links -PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_winbind_csw\.so\.1) -PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_wins_csw\.so\.1) +PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_winbind_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/nss_wins_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_winbind_csw.so.1 +PKGFILES_CSWsamba-nss-system-links += /usr/lib/64/nss_wins_csw.so.1 SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss +CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += surplus-dependency|CSWsamba-nss +CHECKPKG_OVERRIDES_CSWsamba-nss-system-links += bad-location-of-file PACKAGES += CSWlibtevent0 CATALOGNAME_CSWlibtevent0 = libtevent0 @@ -367,7 +378,7 @@ # system's nsswitch.conf if [ "$(MEMORYMODEL)" = "32" ]; then \ ginstall -d $(DESTDIR)/usr/lib; \ - ln -s ../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \ + ln -s ../../opt/csw/lib/nss_winbind.so.1 \ $(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \ ln -s ../../opt/csw/lib/nss_wins.so.1 \ $(DESTDIR)/usr/lib/nss_wins_csw.so.1; \ 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 Jun 30 10:33:26 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 30 Jun 2013 08:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[21415] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: Revision: 21415 http://gar.svn.sourceforge.net/gar/?rev=21415&view=rev Author: lblume Date: 2013-06-30 08:33:16 +0000 (Sun, 30 Jun 2013) Log Message: ----------- samba/branches/samba3: Add cookies Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-29 23:17:38 UTC (rev 21414) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2013-06-30 08:33:16 UTC (rev 21415) @@ -365,6 +365,7 @@ # KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s,-I/opt/csw/include,,`" -perl -pi -e 's!/\@INCLUDE_des\@//!,-I$(includedir),,!' \ $(WORKSRC)/source3/configure + @$(MAKECOOKIE) post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d @@ -390,3 +391,5 @@ ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_wins.so.1 \ $(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_wins_csw.so.1; \ fi + @$(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 Sun Jun 30 21:26:27 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 30 Jun 2013 19:26:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[21416] csw/mgar/pkg/scummvm-tools/trunk/files/ 0002-avoid-deque-constructor-for-studio.patch Message-ID: Revision: 21416 http://gar.svn.sourceforge.net/gar/?rev=21416&view=rev Author: lblume Date: 2013-06-30 19:26:21 +0000 (Sun, 30 Jun 2013) Log Message: ----------- scummvm-tools/trunk: Copy/paste fail, fixed Modified Paths: -------------- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch Modified: csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-30 08:33:16 UTC (rev 21415) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-30 19:26:21 UTC (rev 21416) @@ -6,7 +6,7 @@ +// If using Solaris Studio +#if defined(__sun) && !defined(__GNUC__) -+ std::deque arguments; for (int i = 1; i < argc; i++); ++ std::deque arguments; for (int i = 0; i < argc; i++) arguments.push_back(argv[i]); +#else std::deque arguments(argv, argv + argc); arguments.pop_front(); // Pop our own name 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 Jun 30 22:07:31 2013 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 30 Jun 2013 20:07:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[21417] csw/mgar/pkg/scummvm-tools/trunk/files/ 0002-avoid-deque-constructor-for-studio.patch Message-ID: Revision: 21417 http://gar.svn.sourceforge.net/gar/?rev=21417&view=rev Author: lblume Date: 2013-06-30 20:07:27 +0000 (Sun, 30 Jun 2013) Log Message: ----------- scummvm-tools/trunk: 3rd time's the charm Modified Paths: -------------- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch Modified: csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch =================================================================== --- csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-30 19:26:21 UTC (rev 21416) +++ csw/mgar/pkg/scummvm-tools/trunk/files/0002-avoid-deque-constructor-for-studio.patch 2013-06-30 20:07:27 UTC (rev 21417) @@ -6,7 +6,7 @@ +// If using Solaris Studio +#if defined(__sun) && !defined(__GNUC__) -+ std::deque arguments; for (int i = 0; i < argc; i++) arguments.push_back(argv[i]); ++ std::deque arguments; for (int i = 1; i < argc; i++) arguments.push_back(argv[i]); +#else std::deque arguments(argv, argv + argc); arguments.pop_front(); // Pop our own name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.