From dmichelsen at users.sourceforge.net  Thu Jun  1 16:29:58 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Jun 2017 14:29:58 +0000
Subject: SF.net SVN: gar:[26222] csw/mgar/pkg/openssl1/branches/lts102
Message-ID: <1496327398.716971.16984@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26222
          http://sourceforge.net/p/gar/code/26222
Author:   dmichelsen
Date:     2017-06-01 14:29:58 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
openssl1/branches/lts102: Update to 1.0.2l

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/branches/lts102/Makefile
    csw/mgar/pkg/openssl1/branches/lts102/checksums

Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-05-31 15:39:52 UTC (rev 26221)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2017-06-01 14:29:58 UTC (rev 26222)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 1.0.2k
+VERSION = 1.0.2l
 GARTYPE = v2
 # Since version 1.0.0, soname is fixed and does not follow the minor releases
 SONAME=1.0.0

Modified: csw/mgar/pkg/openssl1/branches/lts102/checksums
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-05-31 15:39:52 UTC (rev 26221)
+++ csw/mgar/pkg/openssl1/branches/lts102/checksums	2017-06-01 14:29:58 UTC (rev 26222)
@@ -1 +1 @@
-f965fc0bf01bf882b31314b61391ae65  openssl-1.0.2k.tar.gz
+f85123cd390e864dfbe517e7616e6566  openssl-1.0.2l.tar.gz

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


From jake_goerzen at users.sourceforge.net  Thu Jun  1 18:20:14 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Thu, 01 Jun 2017 16:20:14 +0000
Subject: SF.net SVN: gar:[26223] csw/mgar/pkg/dovecot-sieve/trunk/Makefile
Message-ID: <1496334014.357622.3566@sfp-scm-8.v30.ch3.sourceforge.com>

Revision: 26223
          http://sourceforge.net/p/gar/code/26223
Author:   jake_goerzen
Date:     2017-06-01 16:20:13 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
dovecot-sieve/trunk: update recipe to build against dovecot version 2.2.30.1

Modified Paths:
--------------
    csw/mgar/pkg/dovecot-sieve/trunk/Makefile

Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-01 14:29:58 UTC (rev 26222)
+++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-01 16:20:13 UTC (rev 26223)
@@ -26,13 +26,13 @@
 UNAME := $(shell /usr/bin/uname -p)
 
 ifeq ($(UNAME), i386)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.29
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.29
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.30.1
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.30.1
 endif
 
 ifeq ($(UNAME), sparc)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.29
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.29
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.30.1
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.30.1
 endif
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))

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


From jake_goerzen at users.sourceforge.net  Tue Jun  6 22:13:21 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 06 Jun 2017 20:13:21 +0000
Subject: SF.net SVN: gar:[26224] csw/mgar/pkg/dovecot/trunk
Message-ID: <1496780001.783025.28975@sfp-scm-4.v30.ch3.sourceforge.com>

Revision: 26224
          http://sourceforge.net/p/gar/code/26224
Author:   jake_goerzen
Date:     2017-06-06 20:13:21 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
dovecot: update to 2.2.30.2

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2017-06-01 16:20:13 UTC (rev 26223)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2017-06-06 20:13:21 UTC (rev 26224)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.30.1
+VERSION = 2.2.30.2
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2017-06-01 16:20:13 UTC (rev 26223)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2017-06-06 20:13:21 UTC (rev 26224)
@@ -1 +1 @@
-d5927c2a00440df40208b6bd415a92c1  dovecot-2.2.30.1.tar.gz
+44a8f904ff1086d2cc7fa99e202f4a7d  dovecot-2.2.30.2.tar.gz

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


From jake_goerzen at users.sourceforge.net  Tue Jun  6 23:07:12 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Tue, 06 Jun 2017 21:07:12 +0000
Subject: SF.net SVN: gar:[26225] csw/mgar/pkg/dovecot-sieve/trunk/Makefile
Message-ID: <1496783232.776019.27115@sfp-scm-3.v30.ch3.sourceforge.com>

Revision: 26225
          http://sourceforge.net/p/gar/code/26225
Author:   jake_goerzen
Date:     2017-06-06 21:07:12 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
dovecot-sieve/trunk: update recipe to build for dovecot 2.2.30.2

Modified Paths:
--------------
    csw/mgar/pkg/dovecot-sieve/trunk/Makefile

Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-06 20:13:21 UTC (rev 26224)
+++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-06 21:07:12 UTC (rev 26225)
@@ -26,13 +26,13 @@
 UNAME := $(shell /usr/bin/uname -p)
 
 ifeq ($(UNAME), i386)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.30.1
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.30.1
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.30.2
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.30.2
 endif
 
 ifeq ($(UNAME), sparc)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.30.1
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.30.1
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.30.2
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.30.2
 endif
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))

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  8 21:24:30 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 08 Jun 2017 19:24:30 +0000
Subject: SF.net SVN: gar:[26226] csw/mgar/pkg/git/trunk
Message-ID: <1496949870.788264.28644@sfp-scm-3.v30.ch3.sourceforge.com>

Revision: 26226
          http://sourceforge.net/p/gar/code/26226
Author:   dmichelsen
Date:     2017-06-08 19:24:30 +0000 (Thu, 08 Jun 2017)
Log Message:
-----------
git/trunk: Commit stuff which is laying around, sort out later what we need

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
    csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
    csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2017-06-06 21:07:12 UTC (rev 26225)
+++ csw/mgar/pkg/git/trunk/Makefile	2017-06-08 19:24:30 UTC (rev 26226)
@@ -1,10 +1,8 @@
 NAME = git
 VERSION = 2.11.0
 #PATCHLEVEL = rc4
-DISTNAME = $(NAME)-$(VERSION)
 GARTYPE = v2
 
-PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 VENDOR_URL = http://git-scm.org/
 
@@ -80,54 +78,153 @@
   mainly for various open source projects, most notably the Linux kernel.
 endef
 
-SPKG_DESC_CSWgit = Fast Version Control System
-SPKG_DESC_CSWgitk = Git revision tree visualiser
-SPKG_DESC_CSWgit-gui = Git GUI tool
-SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories
-SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories
-SPKG_DESC_CSWgit-doc = Documentation for Git
-SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs
-SPKG_DESC_CSWgit-completion = Bash completion support for Git
-SPKG_DESC_CSWgit-dev = Headers and static libraries for Git
-
 MASTER_SITES = https://www.kernel.org/pub/software/scm/git/
-DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.xz
 DISTFILES += CSWgit.postinstall
 
-PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch
-PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
-PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
-PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-PATCHFILES += 0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
-PATCHFILES += 0006-Work-around-sed-invocation-that-Solaris-xpg4-sed-can.patch
+#PATCHFILES += 0001-Update-path-in-documentation-to-be-CSW-proper.patch
+#PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
+#PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
+#PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+## TODO(bdwalton) Remove this post 2.1.1
+#PATCHFILES += 0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
 
+#PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
+#PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch
+
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.
-PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
+# PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 
+VENDOR_URL = http://git-scm.org/
+
+BUILD_DEP_PKGS += CSWasciidoc
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWxmlto
+BUILD_DEP_PKGS += CSWbash
+BUILD_DEP_PKGS += CSWlibcurl-dev
+BUILD_DEP_PKGS += CSWgsed
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWtk
+BUILD_DEP_PKGS += CSWexpat
+BUILD_DEP_PKGS += CSWzlib
+BUILD_DEP_PKGS += CSWpmerror
+BUILD_DEP_PKGS += CSWpmsvn
+BUILD_DEP_PKGS += CSWcvs
+BUILD_DEP_PKGS += CSWemacs
+BUILD_DEP_PKGS += CSWpython
+BUILD_DEP_PKGS += CSWlibiconv-dev
+
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files
 $(foreach d,$(fdirs),$(d)/.*$(1).*) $(sharedstatedir)/$(1).*
 endef
 
+PACKAGES += CSWgit
+SPKG_DESC_CSWgit = Fast Version Control System
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgit += CSWlibz1 
+RUNTIME_DEP_PKGS_CSWgit += CSWperl 
+RUNTIME_DEP_PKGS_CSWgit += CSWrsync 
+RUNTIME_DEP_PKGS_CSWgit += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWgit += CSWopenssh-client
+RUNTIME_DEP_PKGS_CSWgit += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgit += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWgit += CSWbash
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-error
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-term-readkey
+RUNTIME_DEP_PKGS_CSWgit += CSWpm-net-smtp-ssl
+RUNTIME_DEP_PKGS_CSWgit += CSWless
+RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
+# These can't be detected by checkpkg
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-error
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-term-readkey
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-net-smtp-ssl
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless
+
+PACKAGES += CSWgitk
+SPKG_DESC_CSWgitk = Git revision tree visualiser
+PKGFILES_CSWgitk = $(call _git_files,gitk)
+RUNTIME_DEP_PKGS_CSWgittk += CSWgit
+RUNTIME_DEP_PKGS_CSWgittk += CSWtk
+CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk
+CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit
+ARCHALL_CSWgitk = 1
+
+PACKAGES += CSWgit-gui
+SPKG_DESC_CSWgit-gui = Git GUI tool
+PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool)
+RUNTIME_DEP_PKGS_CSWgit-gui += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-gui += CSWtk
+CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk
+CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit
+ARCHALL_CSWgit-gui = 1
+
+PACKAGES += CSWgit-svn
+SPKG_DESC_CSWgit-svn = Git tools for working with Subversion repositories
 PKGFILES_CSWgit-svn = $(call _git_files,git-svn)
-PKGFILES_CSWgit-gui = $(call _git_files,git-gui) $(call _git_files,git-citool)
-PKGFILES_CSWgitk = $(call _git_files,gitk)
+RUNTIME_DEP_PKGS_CSWgit-svn += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-svn += CSWpm-subversion
+CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit
+CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpm-subversion
+ARCHALL_CSWgit-svn = 1
+
+PACKAGES += CSWgit-cvs
+SPKG_DESC_CSWgit-cvs = Git tools for working with CVS repositories
 PKGFILES_CSWgit-cvs = $(foreach d,$(fdirs),$(d)/.*cvs.*)
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWcvs
+RUNTIME_DEP_PKGS_CSWgit-cvs += CSWcvsps
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit
+CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs
+ARCHALL_CSWgit-cvs = 1
+
+PACKAGES += CSWgit-emacs
+SPKG_DESC_CSWgit-emacs = Git VCS support for Emacs
 PKGFILES_CSWgit-emacs = .*emacs.*
+RUNTIME_DEP_PKGS_CSWgit-emacs += CSWgit
+CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit
+ARCHALL_CSWgit-emacs = 1
+
+PACKAGES += CSWgit-doc
+SPKG_DESC_CSWgit-doc = Documentation for Git
 PKGFILES_CSWgit-doc = $(docdir)/git-doc.*
+ARCHALL_CSWgit-doc = 1
+
+PACKAGES += CSWgit-completion
+SPKG_DESC_CSWgit-completion = Bash completion support for Git
 PKGFILES_CSWgit-completion = .*/bash_completion.d/.*
+ARCHALL_CSWgit-completion = 1
+# We include bash here even though git itself depends on it because in theory
+# git could use any other POSIX compliant shell and drop the dependency...
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWbash
+RUNTIME_DEP_PKGS_CSWgit-completion += CSWbashcmplt
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt
+CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit
+
+PACKAGES += CSWgit-dev
+SPKG_DESC_CSWgit-dev = Headers and static libraries for Git
 PKGFILES_CSWgit-dev = $(includedir)/.* $(libdir)/.*
+RUNTIME_DEP_PKGS_CSWgit-dev += CSWgit
+RUNTIME_DEP_PKGS_CSWgit-dev += CSWperl
 
-# We define upstream file regex so we can be notifed of new upstream
-# software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
 #set bashconfdir to sysconfdir when bash changes
-bashconfdir = /opt/csw/etc/
+bashconfdir = $(sysconfdir)
 
+# Make sure printf works for UTF8, for details see
+#   https://www.opencsw.org/mantis/view.php?id=5298
+EXTRA_CFLAGS += -xc99
+
+# We need 'grep -a'
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
 CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
 CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish
@@ -140,101 +237,100 @@
 CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less
 CONFIGURE_ARGS += --without-python
 
-BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
-		ASCIIDOC_NO_ROFF=YesPlease \
-		all
+#BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
+#		ASCIIDOC_NO_ROFF=YesPlease \
+#		all
 
-INSTALL_ARGS = 	INSTALLDIRS=vendor \
-		install-man install-html
+#NO_SVN_TESTS = YesPlease
+#GIT_TEST_OPTS = -i -v -d
+#EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
 
+# There is currently one test failing, skip for now
+SKIPTEST ?= 1
+
+# We need bash or the tests won't run
+TEST_ARGS += SHELL=/opt/csw/bin/bash
+
+# disable tests until next version bump (at the top so it stands out)
+# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
+# detected as the first available utf8 locale.  the failure is
+# harmless though.
+# TEST_SCRIPTS =
+TEST_TARGET = test
+
+
+#INSTALL_ARGS = 	INSTALLDIRS=vendor \
+#		install-man install-html
+
 # We want static libs installed for our devel package
-MERGE_EXCLUDE_STATICLIBS =
+#MERGE_EXCLUDE_STATICLIBS =
 
 ETCSERVICES = /etc/opt/csw/pkg/CSWgit/services
 
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt
-CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-doc += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a
-CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWless
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpmnetsmtpssl
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-term-readkey
-CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWpm-error
-CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email
-CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb
-CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWtk
-CHECKPKG_OVERRIDES_CSWgit-gui += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-emacs += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvsps
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-cvs += surplus-dependency|CSWcvs
-CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWtk
-CHECKPKG_OVERRIDES_CSWgitk += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWgit
-CHECKPKG_OVERRIDES_CSWgit-svn += surplus-dependency|CSWpmsvn
+#CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libgit.a
+#CHECKPKG_OVERRIDES_CSWgit-dev += discouraged-path-in-pkgmap|/opt/csw/lib/git/libxdiff.a
+#CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/share|root/opt/csw/libexec/git-core/git-send-email
+#CHECKPKG_OVERRIDES_CSWgit += file-with-bad-content|/usr/local|root/opt/csw/libexec/git-core/git-instaweb
 CHECKPKG_OVERRIDES_CSWgit-svn += dependency-on-stub|pm_subversion_stub
 CHECKPKG_OVERRIDES_CSWgit += dependency-on-stub|pm_netsmtpssl_stub
 
+EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal\.pod
+
 include gar/category.mk
 
 # for tail -n and to override things like, etc with the gnu counterparts
 # gnu must come first so xpg4/sed isn't found first.
-PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
+# PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
 
-post-configure-modulated:
+post-configure:
 	@echo "Forcing GIT_TEST_CMP tool"
-	@( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak )
-	@( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak )
+	#( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak )
+	( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak )
 	@$(MAKECOOKIE)
 
 # force the elisp extension to be built too.
-post-build-modulated:
+post-build:
 	@echo Builing Emacs Git extension
-	@( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
+	#( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
 
-post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(NAME)
-post-install-modulated: CONTHOOKS=$(GD)/contrib/hooks
-post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d
-post-install-modulated: ID=$(DESTDIR)/$(includedir)/git
-post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git
-post-install-modulated:
+post-install: GD=$(DESTDIR)/$(datadir)/doc/$(NAME)
+post-install: CONTHOOKS=$(GD)/contrib/hooks
+post-install: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d
+post-install: ID=$(DESTDIR)/$(includedir)/git
+post-install: LD=$(DESTDIR)/$(libdir_install)/git
+post-install:
 	@echo Installing /etc/services definitions file
-	@( ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWgit/; \
-	   echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \
-	   echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); )
+	#( ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWgit/; \
+	#   echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \
+	#   echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); )
 	@echo Cleaning up perl stuff
-	@rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5*
-	@rm -rf $(DESTDIR)/$(perllib)/
-	@chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm
+	#rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5*
+	#rm -rf $(DESTDIR)/$(perllib)/
+	#chmod 644 $(DESTDIR)/$(datadir)/perl/csw/*pm
 	@echo Installing Emacs Git extension
-	@( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \
-		emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp )
+	#( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \
+	#	emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp )
 	@echo Installing devel files
-	@( cd $(WORKSRC); \
-		ginstall -c -m 0755 -d $(ID) $(LD); \
-		for f in `find . -name "*.h"`; do \
-			dn=`dirname $$f`; \
-			ginstall -c -m 0755 -d $(ID)/$$dn; \
-			ginstall -c -m 0644 $$f $(ID)/$$dn; \
-		done; \
-		ginstall -c -m 0444 libgit.a $(LD)/; \
-		ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a )
+	#( cd $(WORKSRC); \
+	#	ginstall -c -m 0755 -d $(ID) $(LD); \
+	#	for f in `find . -name "*.h"`; do \
+	#		dn=`dirname $$f`; \
+	#		ginstall -c -m 0755 -d $(ID)/$$dn; \
+	#		ginstall -c -m 0644 $$f $(ID)/$$dn; \
+	#	done; \
+	#	ginstall -c -m 0444 libgit.a $(LD)/; \
+	#	ginstall -c -m 0444 ./xdiff/lib.a $(LD)/libxdiff.a )
 	@echo Installing Bash Completion files
-	@( cd $(WORKSRC); \
-		ginstall -c -m 0755 -d $(BD); \
-		cp contrib/completion/git-completion.bash $(BD)/; \
-		cp contrib/completion/git-prompt.sh $(BD)/; \
-		ginstall -c -m 0755 -d $(GD); \
-		cp contrib/completion/git-completion.tcsh $(GD)/; \
-		cp contrib/completion/git-completion.zsh $(GD)/; \
-		)
-	@( cd $(WORKSRC)/contrib/hooks; \
-		perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \
-		ginstall -c -d -m 0755 $(CONTHOOKS); \
-		ginstall -c -m 0644 post-receive-email $(CONTHOOKS) )
+	#( cd $(WORKSRC); \
+	#	ginstall -c -m 0755 -d $(BD); \
+	#	cp contrib/completion/git-completion.bash $(BD)/; \
+	#	cp contrib/completion/git-prompt.sh $(BD)/; \
+	#	ginstall -c -m 0755 -d $(GD); \
+	#	cp contrib/completion/git-completion.tcsh $(GD)/; \
+	#	cp contrib/completion/git-completion.zsh $(GD)/; \
+	#	)
+	#( cd $(WORKSRC)/contrib/hooks; \
+	#	perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \
+	#	ginstall -c -d -m 0755 $(CONTHOOKS); \
+	#	ginstall -c -m 0644 post-receive-email $(CONTHOOKS) )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch	2017-06-06 21:07:12 UTC (rev 26225)
+++ csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch	2017-06-08 19:24:30 UTC (rev 26226)
@@ -5,19 +5,19 @@
  directory in /opt/csw/share instead of /usr/share
 
 ---
- Documentation/git-init.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Documentation/git-init.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
 index 9d27197..8ac7299 100644
 --- a/Documentation/git-init.txt
 +++ b/Documentation/git-init.txt
-@@ -127,7 +127,7 @@ The template directory will be one of the following (in order):
+@@ -114,7 +114,7 @@ The template directory used will (in order):
  
-  - the `init.templateDir` configuration variable; or
+  - The `init.templatedir` configuration variable.
  
-- - the default template directory: `/usr/share/git-core/templates`.
-+ - the default template directory: `/opt/csw/share/git-core/templates`.
+- - The default template directory: `/usr/share/git-core/templates`.
++ - The default template directory: `/opt/csw/share/git-core/templates`.
  
  The default template directory includes some directory structure, suggested
  "exclude patterns" (see linkgit:gitignore[5]), and sample hook files.

Added: csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,26 @@
+From b5283517ab288ed1efee604e646894b08e995eae Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Sep 2014 12:01:20 +0100
+Subject: [PATCH] Backport a fix for trace_strbuf from origin/next.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ trace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trace.c b/trace.c
+index e583dc6..17015fd 100644
+--- a/trace.c
++++ b/trace.c
+@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char *format, ...)
+ 	va_end(ap);
+ }
+ 
+-void trace_strbuf(const char *key, const struct strbuf *data)
++void trace_strbuf(struct trace_key *key, const struct strbuf *data)
+ {
+ 	trace_strbuf_fl(NULL, 0, key, data);
+ }
+-- 
+2.0.3
+

Added: csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch	2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,35 @@
+From 1c56cdfaa14f59af95c73ac1d1ec46200cd47e16 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bdwalton at gmail.com>
+Date: Sat, 27 Sep 2014 19:35:18 +0100
+Subject: [PATCH] Do not make trace.c/getnanotime and inlined function
+
+Oracle Studio compilers don't allow for static variables in functions
+that are defined to be inline. GNU C does permit this. Let's reference
+the C99 standard though, which doesn't allow for inline functions to
+contain modifiable static variables.
+
+As the use of trace.c/getnanotime extends beyond the local translation
+unit, normal object code is generated for it anyway. Remove the inline
+statement from the function definition.
+
+Signed-off-by: Ben Walton <bdwalton at gmail.com>
+---
+ trace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trace.c b/trace.c
+index b6f25a2..4778608 100644
+--- a/trace.c
++++ b/trace.c
+@@ -385,7 +385,7 @@ static inline uint64_t gettimeofday_nanos(void)
+  * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
+  * (i.e. favoring high precision over wall clock time accuracy).
+  */
+-inline uint64_t getnanotime(void)
++uint64_t getnanotime(void)
+ {
+ 	static uint64_t offset;
+ 	if (offset > 1) {
+-- 
+1.9.1
+

Added: csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-Fix-a-hashbang-issue-in-the-test-suite.patch	2017-06-08 19:24:30 UTC (rev 26226)
@@ -0,0 +1,28 @@
+From 3a7c0997ccbf33ba136d2ef78827d345f5f37de9 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 28 Sep 2014 23:13:40 +0100
+Subject: [PATCH] Fix a hashbang issue in the test suite.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/lib-credential.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/lib-credential.sh b/t/lib-credential.sh
+index 9e7d796..ca4a6de 100755
+--- a/t/lib-credential.sh
++++ b/t/lib-credential.sh
+@@ -278,8 +278,8 @@ helper_test_timeout() {
+ 	'
+ }
+ 
+-cat >askpass <<\EOF
+-#!/bin/sh
++echo "#!$SHELL_PATH" >askpass
++cat >>askpass <<\EOF
+ echo >&2 askpass: $*
+ what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
+ echo "askpass-$what"
+-- 
+2.0.3
+

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


From dmichelsen at users.sourceforge.net  Thu Jun  8 21:26:05 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 08 Jun 2017 19:26:05 +0000
Subject: SF.net SVN: gar:[26227] csw/mgar/pkg/git/trunk
Message-ID: <1496949965.198937.14124@sfp-scm-4.v30.ch3.sourceforge.com>

Revision: 26227
          http://sourceforge.net/p/gar/code/26227
Author:   dmichelsen
Date:     2017-06-08 19:26:04 +0000 (Thu, 08 Jun 2017)
Log Message:
-----------
git/trunk: Update to 2.13.1

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2017-06-08 19:24:30 UTC (rev 26226)
+++ csw/mgar/pkg/git/trunk/Makefile	2017-06-08 19:26:04 UTC (rev 26227)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 2.11.0
+VERSION = 2.13.1
 #PATCHLEVEL = rc4
 GARTYPE = v2
 

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2017-06-08 19:24:30 UTC (rev 26226)
+++ csw/mgar/pkg/git/trunk/checksums	2017-06-08 19:26:04 UTC (rev 26227)
@@ -1 +1 @@
-eac9324afcf4c95ab11acb2e2283e376  git-2.11.0.tar.gz
+25ee4131d5398d32073b3ad7c39c4252  git-2.13.1.tar.xz

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


From dmichelsen at users.sourceforge.net  Fri Jun  9 09:17:22 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 09 Jun 2017 07:17:22 +0000
Subject: SF.net SVN: gar:[26228] csw/mgar/pkg/git/trunk
Message-ID: <1496992642.844653.30900@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26228
          http://sourceforge.net/p/gar/code/26228
Author:   dmichelsen
Date:     2017-06-09 07:17:22 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
git/trunk: Minor adjustments

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2017-06-08 19:26:04 UTC (rev 26227)
+++ csw/mgar/pkg/git/trunk/Makefile	2017-06-09 07:17:22 UTC (rev 26228)
@@ -3,74 +3,6 @@
 #PATCHLEVEL = rc4
 GARTYPE = v2
 
-
-VENDOR_URL = http://git-scm.org/
-
-NO_SVN_TESTS=YesPlease
-GIT_TEST_OPTS=-i -v -d
-EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
-
-# disable tests until next version bump (at the top so it stands out)
-# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
-# detected as the first available utf8 locale.  the failure is
-# harmless though.
-TEST_SCRIPTS =
-TEST_TARGET = test
-
-PACKAGES  = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs
-PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev
-
-CATALOGNAME_CSWgit = git
-CATALOGNAME_CSWgit-cvs = git_cvs
-CATALOGNAME_CSWgit-svn = git_svn
-CATALOGNAME_CSWgit-emacs = git_emacs
-CATALOGNAME_CSWgit-gui = git_gui
-CATALOGNAME_CSWgit-doc = git_doc
-CATALOGNAME_CSWgitk = gitk
-CATALOGNAME_CSWgit-completion = git_completion
-CATALOGNAME_CSWgit-dev = git_dev
-
-ARCHALL_CSWgit-svn = 1
-ARCHALL_CSWgit-cvs = 1
-ARCHALL_CSWgitk = 1
-ARCHALL_CSWgit-gui = 1
-ARCHALL_CSWgit-emacs = 1
-ARCHALL_CSWgit-doc = 1
-ARCHALL_CSWgit-completion = 1
-
-BUILD_DEP_PKGS = CSWasciidoc CSWlibssl-dev CSWxmlto CSWbash CSWlibcurl-dev
-BUILD_DEP_PKGS += CSWgsed CSWperl CSWtk CSWexpat
-BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs
-BUILD_DEP_PKGS += CSWpython
-BUILD_DEP_PKGS += CSWlibiconv-dev
-
-RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWgit += CSWopenssh-client CSWlibiconv2 CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWgit += CSWbash CSWpm-error CSWpm-term-readkey
-RUNTIME_DEP_PKGS_CSWgit += CSWpmnetsmtpssl CSWless
-RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
-
-RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk
-
-RUNTIME_DEP_PKGS_CSWgit-gui = CSWgit CSWtk
-
-RUNTIME_DEP_PKGS_CSWgit-svn = CSWgit CSWpmsvn
-
-RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps
-
-RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacs-common
-
-RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit
-
-RUNTIME_DEP_PKGS_CSWgit-dev = CSWgit
-
-# We include bash here even though git itself depends on it because in theory
-# git could use any other POSIX compliant shell and drop the dependency...
-RUNTIME_DEP_PKGS_CSWgit-completion = CSWgit CSWbash CSWbashcmplt
-
-LICENSE = COPYING
-
 DESCRIPTION = Fast Version Control System
 define BLURB
   Git is a popular version control system designed to handle
@@ -96,8 +28,13 @@
 # to the selection of available utf8 locales.
 # PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 
+# Added for 2.13.1
+PATCHFILES += 0001-Do-not-return-values-in-void-functions.patch
+
 VENDOR_URL = http://git-scm.org/
 
+LICENSE = COPYING
+
 BUILD_DEP_PKGS += CSWasciidoc
 BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWxmlto
@@ -138,6 +75,7 @@
 RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
 # These can't be detected by checkpkg
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
@@ -215,6 +153,12 @@
 RUNTIME_DEP_PKGS_CSWgit-dev += CSWgit
 RUNTIME_DEP_PKGS_CSWgit-dev += CSWperl
 
+REINPLACE_USRLOCAL += git-compat-util.h
+REINPLACE_USRLOCAL += git-instaweb.sh
+
+REINPLACE_USRSHARE += builtin/init-db.c
+REINPLACE_USRSHARE += git-send-email.perl
+
 #set bashconfdir to sysconfdir when bash changes
 bashconfdir = $(sysconfdir)
 
@@ -246,7 +190,7 @@
 #EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
 
 # There is currently one test failing, skip for now
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
 
 # We need bash or the tests won't run
 TEST_ARGS += SHELL=/opt/csw/bin/bash
@@ -258,7 +202,6 @@
 # TEST_SCRIPTS =
 TEST_TARGET = test
 
-
 #INSTALL_ARGS = 	INSTALLDIRS=vendor \
 #		install-man install-html
 

Added: csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch	2017-06-09 07:17:22 UTC (rev 26228)
@@ -0,0 +1,25 @@
+From 7e6dbb2bfa53a7eb0ca489d406db41bab673021b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 9 Jun 2017 08:28:12 +0200
+Subject: [PATCH] Do not return values in void functions
+
+---
+ ref-filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ref-filter.c b/ref-filter.c
+index 2cc7b01..467c027 100644
+--- a/ref-filter.c
++++ b/ref-filter.c
+@@ -221,7 +221,7 @@ static void objectname_atom_parser(struct used_atom *atom, const char *arg)
+ 
+ static void refname_atom_parser(struct used_atom *atom, const char *arg)
+ {
+-	return refname_atom_parser_internal(&atom->u.refname, arg, atom->name);
++	refname_atom_parser_internal(&atom->u.refname, arg, atom->name);
+ }
+ 
+ static align_type parse_align_position(const char *s)
+-- 
+2.4.0
+

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


From dmichelsen at users.sourceforge.net  Fri Jun  9 13:53:33 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 09 Jun 2017 11:53:33 +0000
Subject: SF.net SVN: gar:[26229] csw/mgar/pkg/lang-python/psutil/trunk
Message-ID: <1497009214.10149.3197@sfp-scm-8.v30.ch3.sourceforge.com>

Revision: 26229
          http://sourceforge.net/p/gar/code/26229
Author:   dmichelsen
Date:     2017-06-09 11:53:33 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
lang-python/psutil/trunk: Update to 5.2.2

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

Removed Paths:
-------------
    csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch

Modified: csw/mgar/pkg/lang-python/psutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 11:53:33 UTC (rev 26229)
@@ -3,7 +3,7 @@
 #
 
 NAME = psutil
-VERSION = 3.2.2
+VERSION = 5.2.2
 GARTYPE = v2
 CATEGORIES = python
 
@@ -11,22 +11,23 @@
 psutil is a cross-platform library for retrieving information onrunning processes and system utilization (CPU,memory, disks, network)in Python. 
 endef
 
-
 MASTER_SITES += $(PYPI_MIRROR)
 DISTFILES += $(DISTNAME).tar.gz
 
 # This is a new package, don't bother building for 2.6 some deps are 2.7 only anyway
-#MODULATIONS_PYTHON_VERSION = 2_7
+MODULATIONS_PYTHON_VERSION = 2_7
+CHECKPKG_OVERRIDES_CSWpy-psutil += python-package-missing-py26-files
 
-PATCHFILES += fix_solaris_build.patch
-
 PACKAGES += CSWpy-psutil
 SPKG_DESC_CSWpy-psutil = Psutil is a library for retrieving information onrunning processes
 # PKGFILES is catchall
-
 RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-7-1-0
-RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibpython2-6-1-0
 RUNTIME_DEP_PKGS_CSWpy-psutil += CSWlibgcc-s1
+# We don't have upstart:
+#   'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg', 'COLORTERM': 'gnome-terminal',
+CHECKPKG_OVERRIDES_CSWpy-psutil += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.7/site-packages/psutil-5.2.2-py2.7.egg-info/PKG-INFO
 
+REINPLACE_USRLOCAL += psutil/tests/test_process.py
+REINPLACE_USRLOCAL += psutil/tests/test_posix.py
 
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/psutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/checksums	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/checksums	2017-06-09 11:53:33 UTC (rev 26229)
@@ -1 +1 @@
-56df1727c9e26076a80da4c3f8f67976  psutil-3.2.2.tar.gz
+bb98d48796cd76d9ccee871aad720f9c  psutil-5.2.2.tar.gz

Deleted: csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch	2017-06-09 07:17:22 UTC (rev 26228)
+++ csw/mgar/pkg/lang-python/psutil/trunk/files/fix_solaris_build.patch	2017-06-09 11:53:33 UTC (rev 26229)
@@ -1,61 +0,0 @@
-From f89aec2e56e1e1e503a6292850048bbea6de31a1 Mon Sep 17 00:00:00 2001
-From: bsebi <sebastianbrestin at gmail.com>
-Date: Wed, 28 Oct 2015 18:50:41 +0200
-Subject: [PATCH] #704: psutil does not compile/cannot be imported on solaris
- sparc
-
----
- CREDITS                | 5 +++++
- psutil/__init__.py     | 2 +-
- psutil/_psutil_posix.c | 2 +-
- setup.py               | 4 ++--
- 5 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/psutil/__init__.py b/psutil/__init__.py
-index 1a75a9f..2343391 100644
---- a/psutil/__init__.py
-+++ b/psutil/__init__.py
-@@ -121,7 +121,7 @@
- elif sys.platform.startswith("freebsd"):
-     from . import _psbsd as _psplatform
- 
--elif sys.platform.startswith("sunos"):
-+elif sys.platform.startswith("sunos") or sys.platform.startswith("solaris"):
-     from . import _pssunos as _psplatform
-     from ._pssunos import (CONN_IDLE,  # NOQA
-                            CONN_BOUND)
-diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c
-index 1e27cdb..1dfbcf4 100644
---- a/psutil/_psutil_posix.c
-+++ b/psutil/_psutil_posix.c
-@@ -16,7 +16,7 @@
- #include <net/if.h>
- 
- #ifdef PSUTIL_SUNOS10
--#include "arch/solaris10/ifaddrs.h"
-+#include "arch/solaris/v10/ifaddrs.h"
- #else
- #include <ifaddrs.h>
- #endif
-diff --git a/setup.py b/setup.py
-index 3cb2dd6..8ff41d3 100644
---- a/setup.py
-+++ b/setup.py
-@@ -71,7 +71,7 @@ def write(self, s):
-     posix_extension = Extension(
-         'psutil._psutil_posix',
-         sources=['psutil/_psutil_posix.c'])
--    if sys.platform.startswith("sunos"):
-+    if sys.platform.startswith("sunos") or sys.platform.startswith("solaris"):
-         posix_extension.libraries.append('socket')
-         if platform.release() == '5.10':
-             posix_extension.sources.append('psutil/arch/solaris/v10/ifaddrs.c')
-@@ -175,7 +175,7 @@ def on_exit():
-         define_macros=macros)
-     extensions = [ext, posix_extension]
- # Solaris
--elif sys.platform.lower().startswith('sunos'):
-+elif sys.platform.lower().startswith('sunos') or sys.platform.lower().startswith('solaris'):
-     ext = Extension(
-         'psutil._psutil_sunos',
-         sources=['psutil/_psutil_sunos.c'],

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  9 14:05:43 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 09 Jun 2017 12:05:43 +0000
Subject: SF.net SVN: gar:[26230] csw/mgar/pkg/lang-python/psutil/trunk/Makefile
Message-ID: <1497009943.860570.10231@sfp-scm-7.v30.ch3.sourceforge.com>

Revision: 26230
          http://sourceforge.net/p/gar/code/26230
Author:   dmichelsen
Date:     2017-06-09 12:05:43 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
lang-python/psutil/trunk: Build on Solaris 10 only

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

Modified: csw/mgar/pkg/lang-python/psutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 11:53:33 UTC (rev 26229)
+++ csw/mgar/pkg/lang-python/psutil/trunk/Makefile	2017-06-09 12:05:43 UTC (rev 26230)
@@ -18,6 +18,9 @@
 MODULATIONS_PYTHON_VERSION = 2_7
 CHECKPKG_OVERRIDES_CSWpy-psutil += python-package-missing-py26-files
 
+# Python stuff builds by default also on Solaris 9, not this module
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
+
 PACKAGES += CSWpy-psutil
 SPKG_DESC_CSWpy-psutil = Psutil is a library for retrieving information onrunning processes
 # PKGFILES is catchall

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


From dmichelsen at users.sourceforge.net  Tue Jun 13 09:40:16 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 13 Jun 2017 07:40:16 +0000
Subject: SF.net SVN: gar:[26231] csw/mgar/pkg/tomcat-native/trunk
Message-ID: <1497339616.783148.8798@sfp-scm-3.v30.ch3.sourceforge.com>

Revision: 26231
          http://sourceforge.net/p/gar/code/26231
Author:   dmichelsen
Date:     2017-06-13 07:40:16 +0000 (Tue, 13 Jun 2017)
Log Message:
-----------
tomcat-native/trunk: Update to 1.2.12

Modified Paths:
--------------
    csw/mgar/pkg/tomcat-native/trunk/Makefile
    csw/mgar/pkg/tomcat-native/trunk/checksums

Modified: csw/mgar/pkg/tomcat-native/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat-native/trunk/Makefile	2017-06-09 12:05:43 UTC (rev 26230)
+++ csw/mgar/pkg/tomcat-native/trunk/Makefile	2017-06-13 07:40:16 UTC (rev 26231)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = tomcat-native
-VERSION = 1.1.33
+VERSION = 1.2.12
 GARTYPE = v2
 
 DESCRIPTION = Tomcat Native Java library
@@ -30,10 +30,10 @@
 #PKGFILES_CSWlibtcnative-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibtcnative-dev += CSWlibtcnative1-0
 
-CONFIGURE_SCRIPTS = $(WORKSRC)/jni/native/configure
-BUILD_SCRIPTS = $(WORKSRC)/jni/native/Makefile
+CONFIGURE_SCRIPTS = $(WORKSRC)/native/configure
+BUILD_SCRIPTS = $(WORKSRC)/native/Makefile
 TEST_SCRIPTS = 
-INSTALL_SCRIPTS = $(WORKSRC)/jni/native/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/native/Makefile
 
 BUILD64 = 1
 

Modified: csw/mgar/pkg/tomcat-native/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat-native/trunk/checksums	2017-06-09 12:05:43 UTC (rev 26230)
+++ csw/mgar/pkg/tomcat-native/trunk/checksums	2017-06-13 07:40:16 UTC (rev 26231)
@@ -1 +1 @@
-04b66308560abf2f08c658eb1703546d  tomcat-native-1.1.33-src.tar.gz
+868cb3f1ca5a5f1eb534f06d5ad56b53  tomcat-native-1.2.12-src.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Jun 13 10:01:24 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 13 Jun 2017 08:01:24 +0000
Subject: SF.net SVN: gar:[26232] csw/mgar/pkg/tomcat8/trunk
Message-ID: <1497340884.140884.13312@sfp-scm-3.v30.ch3.sourceforge.com>

Revision: 26232
          http://sourceforge.net/p/gar/code/26232
Author:   dmichelsen
Date:     2017-06-13 08:01:23 +0000 (Tue, 13 Jun 2017)
Log Message:
-----------
tomcat8/trunk: Update to 8.0.44

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

Modified: csw/mgar/pkg/tomcat8/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/Makefile	2017-06-13 07:40:16 UTC (rev 26231)
+++ csw/mgar/pkg/tomcat8/trunk/Makefile	2017-06-13 08:01:23 UTC (rev 26232)
@@ -1,5 +1,5 @@
 NAME = apache-tomcat
-VERSION = 8.0.27
+VERSION = 8.0.44
 
 DESCRIPTION = Apache Jakarta Tomcat 8 Servlet/JSP Container
 

Modified: csw/mgar/pkg/tomcat8/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/checksums	2017-06-13 07:40:16 UTC (rev 26231)
+++ csw/mgar/pkg/tomcat8/trunk/checksums	2017-06-13 08:01:23 UTC (rev 26232)
@@ -1 +1 @@
-a20be33bfb31a2c6e2eca755fb211cb9  apache-tomcat-8.0.27.tar.gz
+67e1fd1b1b9d65510d65c9e9d1a440f4  apache-tomcat-8.0.44.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed Jun 14 09:59:05 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 14 Jun 2017 07:59:05 +0000
Subject: SF.net SVN: gar:[26233] csw/mgar/pkg/curl/trunk
Message-ID: <1497427145.861138.18216@sfp-scm-4.v30.ch3.sourceforge.com>

Revision: 26233
          http://sourceforge.net/p/gar/code/26233
Author:   dmichelsen
Date:     2017-06-14 07:59:05 +0000 (Wed, 14 Jun 2017)
Log Message:
-----------
curl/trunk: Update to 7.54.1

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

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2017-06-13 08:01:23 UTC (rev 26232)
+++ csw/mgar/pkg/curl/trunk/Makefile	2017-06-14 07:59:05 UTC (rev 26233)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.54.0
+VERSION = 7.54.1
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers

Modified: csw/mgar/pkg/curl/trunk/checksums
===================================================================
--- csw/mgar/pkg/curl/trunk/checksums	2017-06-13 08:01:23 UTC (rev 26232)
+++ csw/mgar/pkg/curl/trunk/checksums	2017-06-14 07:59:05 UTC (rev 26233)
@@ -1 +1 @@
-3cf2de0ca4ac43e59067eb6b4f876982  curl-7.54.0.tar.lzma
+4a282f6c740f7720b4d95ab12dcba261  curl-7.54.1.tar.lzma

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


From dmichelsen at users.sourceforge.net  Wed Jun 14 11:35:34 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 14 Jun 2017 09:35:34 +0000
Subject: SF.net SVN: gar:[26234] csw/mgar/pkg/squid/trunk
Message-ID: <1497432934.49171.32223@sfp-scm-5.v30.ch3.sourceforge.com>

Revision: 26234
          http://sourceforge.net/p/gar/code/26234
Author:   dmichelsen
Date:     2017-06-14 09:35:33 +0000 (Wed, 14 Jun 2017)
Log Message:
-----------
squid/trunk: Update to 3.5.26

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

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2017-06-14 07:59:05 UTC (rev 26233)
+++ csw/mgar/pkg/squid/trunk/Makefile	2017-06-14 09:35:33 UTC (rev 26234)
@@ -2,7 +2,7 @@
 # $Id$
 #
 NAME = squid
-VERSION = 3.5.22
+VERSION = 3.5.26
 GARTYPE = v2
 
 DESCRIPTION = High performance Web proxy cache
@@ -146,6 +146,7 @@
 CONFIGURE_ENV_PATH = /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
 
 GARCOMPILER = GNU
+# GARCOMPILER = SOS12U4
 
 #EXTRA_LIB += $(prefix)/bdb48/lib
 #EXTRA_INC += $(prefix)/bdb48/include
@@ -178,9 +179,9 @@
 
 include gar/category.mk
 
-pre-configure:
-	cd $(WORKSRC) && autoreconf --force --install
-	@$(MAKECOOKIE)
+#pre-configure:
+#	cd $(WORKSRC) && autoreconf --force --install
+#	@$(MAKECOOKIE)
 	
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2017-06-14 07:59:05 UTC (rev 26233)
+++ csw/mgar/pkg/squid/trunk/checksums	2017-06-14 09:35:33 UTC (rev 26234)
@@ -1 +1 @@
-83472797a0dd5090af348df27f923ed2  squid-3.5.22.tar.bz2
+dc1830cd361e077814aa39bcc3691d8b  squid-3.5.26.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  Thu Jun 15 21:22:11 2017
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 15 Jun 2017 19:22:11 +0000
Subject: SF.net SVN: gar:[26235] csw/mgar/pkg/bind/trunk
Message-ID: <1497554531.242395.17305@sfp-scm-6.v30.ch3.sourceforge.com>

Revision: 26235
          http://sourceforge.net/p/gar/code/26235
Author:   bonivart
Date:     2017-06-15 19:22:10 +0000 (Thu, 15 Jun 2017)
Log Message:
-----------
bind/trunk: Update to 9.11.1-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	2017-06-14 09:35:33 UTC (rev 26234)
+++ csw/mgar/pkg/bind/trunk/Makefile	2017-06-15 19:22:10 UTC (rev 26235)
@@ -15,11 +15,11 @@
 #WORKSRC = $(WORKDIR)/$(DISTNAME)
 
 # Enable these for Px-releases
-#RELEASE = P5
-#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
@@ -30,12 +30,12 @@
 #DISTFILES  = $(DISTNAME).tar.gz
 
 # 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	2017-06-14 09:35:33 UTC (rev 26234)
+++ csw/mgar/pkg/bind/trunk/checksums	2017-06-15 19:22:10 UTC (rev 26235)
@@ -1 +1 @@
-c384ab071d902bac13487c1268e5a32f  bind-9.11.1.tar.gz
+73a6b63a02bd3f918848fafcd6423261  bind-9.11.1-P1.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Jun 20 09:19:54 2017
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 20 Jun 2017 07:19:54 +0000
Subject: SF.net SVN: gar:[26236] csw/mgar/pkg/apache24/trunk
Message-ID: <1497943194.790778.8147@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26236
          http://sourceforge.net/p/gar/code/26236
Author:   dmichelsen
Date:     2017-06-20 07:19:54 +0000 (Tue, 20 Jun 2017)
Log Message:
-----------
apache24/trunk: Update to 2.4.26

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

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2017-06-15 19:22:10 UTC (rev 26235)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2017-06-20 07:19:54 UTC (rev 26236)
@@ -1,7 +1,7 @@
 # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $
 
 NAME = httpd
-VERSION = 2.4.23
+VERSION = 2.4.26
 GARTYPE = v2
 
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc

Modified: csw/mgar/pkg/apache24/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache24/trunk/checksums	2017-06-15 19:22:10 UTC (rev 26235)
+++ csw/mgar/pkg/apache24/trunk/checksums	2017-06-20 07:19:54 UTC (rev 26236)
@@ -1 +1 @@
-b711ea7d8b75dc8bfdf5a5d7e5253088  httpd-2.4.23.tar.gz
+492aeb0f752baf7e895fea6334dfe202  httpd-2.4.26.tar.gz

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


From jake_goerzen at users.sourceforge.net  Mon Jun 26 16:43:02 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 26 Jun 2017 14:43:02 +0000
Subject: SF.net SVN: gar:[26237] csw/mgar/pkg/dovecot/trunk
Message-ID: <1498488182.729377.10286@sfp-scm-6.v30.ch3.sourceforge.com>

Revision: 26237
          http://sourceforge.net/p/gar/code/26237
Author:   jake_goerzen
Date:     2017-06-26 14:43:02 +0000 (Mon, 26 Jun 2017)
Log Message:
-----------
dovecot: update to 2.2.31

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2017-06-20 07:19:54 UTC (rev 26236)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2017-06-26 14:43:02 UTC (rev 26237)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.2.30.2
+VERSION = 2.2.31
 GARTYPE = v2
 
 DESCRIPTION = Secure IMAP server

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2017-06-20 07:19:54 UTC (rev 26236)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2017-06-26 14:43:02 UTC (rev 26237)
@@ -1 +1 @@
-44a8f904ff1086d2cc7fa99e202f4a7d  dovecot-2.2.30.2.tar.gz
+2f93f07912a4ea91611b071dc9be4cd1  dovecot-2.2.31.tar.gz

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


From jake_goerzen at users.sourceforge.net  Mon Jun 26 22:36:42 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 26 Jun 2017 20:36:42 +0000
Subject: SF.net SVN: gar:[26238] csw/mgar/pkg/dovecot-sieve/trunk/Makefile
Message-ID: <1498509402.112059.26578@sfp-scm-4.v30.ch3.sourceforge.com>

Revision: 26238
          http://sourceforge.net/p/gar/code/26238
Author:   jake_goerzen
Date:     2017-06-26 20:36:41 +0000 (Mon, 26 Jun 2017)
Log Message:
-----------
dovecot-sieve/trunk: update to 0.4.19 and build against dovecot 2.2.31

Modified Paths:
--------------
    csw/mgar/pkg/dovecot-sieve/trunk/Makefile

Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-26 14:43:02 UTC (rev 26237)
+++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile	2017-06-26 20:36:41 UTC (rev 26238)
@@ -1,5 +1,5 @@
 NAME = dovecot-2.2-pigeonhole
-VERSION = 0.4.18
+VERSION = 0.4.19
 GARTYPE = v2
 
 DESCRIPTION = Secure POP3/IMAP server - Sieve filters support
@@ -26,13 +26,13 @@
 UNAME := $(shell /usr/bin/uname -p)
 
 ifeq ($(UNAME), i386)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.30.2
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.30.2
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-pentium_pro/dovecot-2.2.31
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-i386/build-isa-amd64/dovecot-2.2.31
 endif
 
 ifeq ($(UNAME), sparc)
-CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.30.2
-CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.30.2
+CONFIGURE_ARGS-32 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv8plus/dovecot-2.2.31
+CONFIGURE_ARGS-64 = $(DIRPATHS) --with-dovecot=../../../../../../dovecot/trunk/work/solaris10-sparc/build-isa-sparcv9/dovecot-2.2.31
 endif
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))

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


From jake_goerzen at users.sourceforge.net  Mon Jun 26 22:37:59 2017
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Mon, 26 Jun 2017 20:37:59 +0000
Subject: SF.net SVN: gar:[26239] csw/mgar/pkg/dovecot-sieve/trunk/checksums
Message-ID: <1498509479.845779.32666@sfp-scm-6.v30.ch3.sourceforge.com>

Revision: 26239
          http://sourceforge.net/p/gar/code/26239
Author:   jake_goerzen
Date:     2017-06-26 20:37:59 +0000 (Mon, 26 Jun 2017)
Log Message:
-----------
dovecot-sieve/trunk: update checksums too

Modified Paths:
--------------
    csw/mgar/pkg/dovecot-sieve/trunk/checksums

Modified: csw/mgar/pkg/dovecot-sieve/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot-sieve/trunk/checksums	2017-06-26 20:36:41 UTC (rev 26238)
+++ csw/mgar/pkg/dovecot-sieve/trunk/checksums	2017-06-26 20:37:59 UTC (rev 26239)
@@ -1 +1 @@
-7e6f55da44500b59b832b3d44dd0cbcb  dovecot-2.2-pigeonhole-0.4.18.tar.gz
+4ffb15c0e84625280b3690784d4d83eb  dovecot-2.2-pigeonhole-0.4.19.tar.gz

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