From dmichelsen at users.sourceforge.net  Fri Jul  3 10:24:32 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 03 Jul 2020 08:24:32 +0000
Subject: SF.net SVN: gar:[26675] csw/mgar/pkg/zutils/trunk
Message-ID: <1593764672.370597.29083@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26675
          http://sourceforge.net/p/gar/code/26675
Author:   dmichelsen
Date:     2020-07-03 08:24:32 +0000 (Fri, 03 Jul 2020)
Log Message:
-----------
zutils/trunk: Update to 1.9

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

Added Paths:
-----------
    csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2020-06-24 10:58:04 UTC (rev 26674)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2020-07-03 08:24:32 UTC (rev 26675)
@@ -1,5 +1,5 @@
 NAME = zutils
-VERSION = 1.7
+VERSION = 1.9
 GARTYPE = v2
 
 DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -18,6 +18,10 @@
 PATCHFILES += 0001-Add-headers-for-kill-2.patch
 PATCHFILES += 0002-Use-test-f-instead-of-e.patch
 
+# Use patch from
+#   https://lists.nongnu.org/archive/html/zutils-bug/2020-07/msg00002.html
+PATCHFILES += 0003-Fix-function-type.patch
+
 VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
 
 BUILD_DEP_PKGS += CSWhelp2man

Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums	2020-06-24 10:58:04 UTC (rev 26674)
+++ csw/mgar/pkg/zutils/trunk/checksums	2020-07-03 08:24:32 UTC (rev 26675)
@@ -1 +1 @@
-7e80bbf1e9f578fa283cba0c9887a2d0  zutils-1.7.tar.lz
+c3f542e3cf4131e294d1d6c9ac9095aa  zutils-1.9.tar.lz

Added: csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch	                        (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Fix-function-type.patch	2020-07-03 08:24:32 UTC (rev 26675)
@@ -0,0 +1,26 @@
+From 12b161614b54346a92e97c7f7a06f2d754ae5731 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 3 Jul 2020 10:08:10 +0200
+Subject: [PATCH] Fix function type
+
+---
+ zupdate.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/zupdate.cc b/zupdate.cc
+index cc0ffde..0acaa48 100644
+--- a/zupdate.cc
++++ b/zupdate.cc
+@@ -280,7 +280,8 @@ int zupdate_file( const std::string & name, const char * const lzip_name,
+   std::string zcmp_command( invocation_name );
+   unsigned i =  zcmp_command.size();
+   while( i > 0 && zcmp_command[i-1] != '/' ) --i;
+-  zcmp_command.resize( i ); zcmp_command.insert( 0U, 1, '\'' );
++  zcmp_command.resize( i ); zcmp_command.insert( zcmp_command.begin(), '\'' );
++
+   zcmp_command += "zcmp' ";				// '[dir/]zcmp'
+   if( no_rcfile ) zcmp_command += "-N ";
+   if( verbosity < 0 ) zcmp_command += "-q ";
+-- 
+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 Jul 10 11:10:24 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 10 Jul 2020 09:10:24 +0000
Subject: SF.net SVN: gar:[26676] csw/mgar/pkg/jq/trunk
Message-ID: <1594372224.362464.24877@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26676
          http://sourceforge.net/p/gar/code/26676
Author:   dmichelsen
Date:     2020-07-10 09:10:23 +0000 (Fri, 10 Jul 2020)
Log Message:
-----------
jq/trunk: Update to 1.6

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

Modified: csw/mgar/pkg/jq/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jq/trunk/Makefile	2020-07-03 08:24:32 UTC (rev 26675)
+++ csw/mgar/pkg/jq/trunk/Makefile	2020-07-10 09:10:23 UTC (rev 26676)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = jq
-VERSION = 1.5
+VERSION = 1.6
 GARTYPE = v2
 
 DESCRIPTION = A lightweight and flexible command-line JSON processor.
@@ -26,15 +26,17 @@
 
 MASTER_SITES = https://github.com/stedolan/jq/releases/download/jq-$(VERSION)/
 DISTFILES += $(DISTNAME).tar.gz
-VENDOR_URL = http://stedolan.github.io/jq/
+VENDOR_URL = https://stedolan.github.io/jq/
 
 PACKAGES += CSWjq
 SPKG_DESC_CSWjq = A lightweight and flexible command-line JSON processor.
+RUNTIME_DEP_PKGS_CSWjq += CSWlibonig2
 # PKGFILES is catchall
 
 PACKAGES += CSWlibjq1
 SPKG_DESC_CSWlibjq1 = A C API interface to jq JSON representation and for running jq programs from C applications
 PKGFILES_CSWlibjq1 += $(call pkgfiles_lib,libjq.so.1)
+RUNTIME_DEP_PKGS_CSWlibjq1 += CSWlibonig2
 RUNTIME_DEP_PKGS_CSWlibjq1 += CSWlibgcc-s1
 
 PACKAGES += CSWlibjq-dev
@@ -45,8 +47,11 @@
 # jq define _XOPEN_SOURCE but it causes problem when compiled with GCC
 # so we undefine it for now
 # see https://www.illumos.org/issues/3801 for detail on this issue
-PATCHFILES += unset_xopen_source_for_solaris.patch
+# PATCHFILES += unset_xopen_source_for_solaris.patch
 
+# The directory already contains a git repo
+NOGITPATCH = 1
+
 GARCOMPILER = GNU
 
 BUILD64 = 1

Modified: csw/mgar/pkg/jq/trunk/checksums
===================================================================
--- csw/mgar/pkg/jq/trunk/checksums	2020-07-03 08:24:32 UTC (rev 26675)
+++ csw/mgar/pkg/jq/trunk/checksums	2020-07-10 09:10:23 UTC (rev 26676)
@@ -1 +1 @@
-0933532b086bd8b6a41c1b162b1731f9  jq-1.5.tar.gz
+e68fbd6a992e36f1ac48c99bbf825d6b  jq-1.6.tar.gz

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


From dmichelsen at users.sourceforge.net  Sun Jul 12 12:19:52 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 12 Jul 2020 10:19:52 +0000
Subject: SF.net SVN: gar:[26677] csw/mgar/pkg/mutt/trunk
Message-ID: <1594549192.491344.20449@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26677
          http://sourceforge.net/p/gar/code/26677
Author:   dmichelsen
Date:     2020-07-12 10:19:52 +0000 (Sun, 12 Jul 2020)
Log Message:
-----------
mutt/trunk: Update to 1.14.6

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

Modified: csw/mgar/pkg/mutt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mutt/trunk/Makefile	2020-07-10 09:10:23 UTC (rev 26676)
+++ csw/mgar/pkg/mutt/trunk/Makefile	2020-07-12 10:19:52 UTC (rev 26677)
@@ -1,5 +1,5 @@
 NAME = mutt
-VERSION = 1.14.4
+VERSION = 1.14.6
 GARTYPE = v2
 
 EXTRA_MODULATORS = SLANG

Modified: csw/mgar/pkg/mutt/trunk/checksums
===================================================================
--- csw/mgar/pkg/mutt/trunk/checksums	2020-07-10 09:10:23 UTC (rev 26676)
+++ csw/mgar/pkg/mutt/trunk/checksums	2020-07-12 10:19:52 UTC (rev 26677)
@@ -1 +1 @@
-a1446e9a169e79001c78692c80090ae5  mutt-1.14.4.tar.gz
+820d46521931cbb25221adb6eb81dcb4  mutt-1.14.6.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Jul 14 19:06:29 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 14 Jul 2020 17:06:29 +0000
Subject: SF.net SVN: gar:[26678] csw/mgar/pkg/nginx/trunk
Message-ID: <1594746389.559321.927@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26678
          http://sourceforge.net/p/gar/code/26678
Author:   dmichelsen
Date:     2020-07-14 17:06:29 +0000 (Tue, 14 Jul 2020)
Log Message:
-----------
nginx/trunk: Update to 1.19.1

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2020-07-12 10:19:52 UTC (rev 26677)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2020-07-14 17:06:29 UTC (rev 26678)
@@ -1,5 +1,5 @@
 NAME = nginx
-VERSION = 1.17.1
+VERSION = 1.19.1
 GARTYPE = v2
 
 DESCRIPTION = HTTP server and mail proxy server
@@ -9,8 +9,8 @@
 endef
 
 MASTER_SITES = http://nginx.org/download/
-DISTFILES    = $(DISTNAME).tar.gz
-DISTFILES   += cswnginx
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswnginx
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2020-07-12 10:19:52 UTC (rev 26677)
+++ csw/mgar/pkg/nginx/trunk/checksums	2020-07-14 17:06:29 UTC (rev 26678)
@@ -1 +1 @@
-51021f3e8204a5fc809f5e695a4508db  nginx-1.17.1.tar.gz
+d14e03b34c47a07d0dd109f8e33c54c3  nginx-1.19.1.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed Jul 15 12:12:11 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 15 Jul 2020 10:12:11 +0000
Subject: SF.net SVN: gar:[26679] csw/mgar/pkg/apache24/trunk
Message-ID: <1594807931.964438.12589@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26679
          http://sourceforge.net/p/gar/code/26679
Author:   dmichelsen
Date:     2020-07-15 10:12:11 +0000 (Wed, 15 Jul 2020)
Log Message:
-----------
apache24/trunk: Update to 2.4.43

Modified Paths:
--------------
    csw/mgar/pkg/apache24/trunk/Makefile
    csw/mgar/pkg/apache24/trunk/checksums
    csw/mgar/pkg/apache24/trunk/files/0001-Add-an-OpenCSW-option-to-config.layout.patch

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2020-07-14 17:06:29 UTC (rev 26678)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2020-07-15 10:12:11 UTC (rev 26679)
@@ -1,7 +1,7 @@
 # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $
 
 NAME = httpd
-VERSION = 2.4.41
+VERSION = 2.4.43
 GARTYPE = v2
 
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc

Modified: csw/mgar/pkg/apache24/trunk/checksums
===================================================================
--- csw/mgar/pkg/apache24/trunk/checksums	2020-07-14 17:06:29 UTC (rev 26678)
+++ csw/mgar/pkg/apache24/trunk/checksums	2020-07-15 10:12:11 UTC (rev 26679)
@@ -1 +1 @@
-9dd9c5fae398c3696805d19cb1f1a104  httpd-2.4.41.tar.gz
+1e0298e7bf0afdb57e6a071c53a322e1  httpd-2.4.43.tar.gz

Modified: csw/mgar/pkg/apache24/trunk/files/0001-Add-an-OpenCSW-option-to-config.layout.patch
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/0001-Add-an-OpenCSW-option-to-config.layout.patch	2020-07-14 17:06:29 UTC (rev 26678)
+++ csw/mgar/pkg/apache24/trunk/files/0001-Add-an-OpenCSW-option-to-config.layout.patch	2020-07-15 10:12:11 UTC (rev 26679)
@@ -1,22 +1,20 @@
-From ecd25ab11aa44a21fae227740ac8fb58c0892e69 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Tue, 2 Oct 2012 11:08:04 +0200
+From 3316bf65c1263ad19ccd874f7a5f5c8f8da52c91 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 15 Jul 2020 10:55:06 +0200
 Subject: [PATCH] Add an OpenCSW option to config.layout
 
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
 ---
  config.layout | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 diff --git a/config.layout b/config.layout
-index 35a325a..acf6efb 100644
+index a29351e..b27e647 100644
 --- a/config.layout
 +++ b/config.layout
-@@ -370,3 +370,27 @@
-     logfiledir:      ${localstatedir}/log/httpd
-     proxycachedir:   ${localstatedir}/cache/httpd
+@@ -419,3 +419,27 @@
+     proxycachedir:   ${localstatedir}/cache/apache2
  </Layout>
-+
+ 
 +# CSW Layout
 +<Layout OpenCSW>
 +    prefix:          @prefix@
@@ -40,6 +38,7 @@
 +    logfiledir:      ${localstatedir}/log/apache2
 +    proxycachedir:   ${datadir}/proxy
 +</Layout>
++
 -- 
-1.7.12
+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  Thu Jul 16 10:29:09 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 16 Jul 2020 08:29:09 +0000
Subject: SF.net SVN: gar:[26680] csw/mgar/pkg/openssl1/branches/lts102
Message-ID: <1594888149.324851.8516@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26680
          http://sourceforge.net/p/gar/code/26680
Author:   dmichelsen
Date:     2020-07-16 08:29:08 +0000 (Thu, 16 Jul 2020)
Log Message:
-----------
openssl1/branches/lts102: Update to 1.0.2u

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	2020-07-15 10:12:11 UTC (rev 26679)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2020-07-16 08:29:08 UTC (rev 26680)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 1.0.2t
+VERSION = 1.0.2u
 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	2020-07-15 10:12:11 UTC (rev 26679)
+++ csw/mgar/pkg/openssl1/branches/lts102/checksums	2020-07-16 08:29:08 UTC (rev 26680)
@@ -1 +1 @@
-ef66581b80f06eae42f5268bc0b50c6d  openssl-1.0.2t.tar.gz
+cdc2638f789ecc2db2c91488265686c1  openssl-1.0.2u.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 Jul 17 16:36:27 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 17 Jul 2020 14:36:27 +0000
Subject: SF.net SVN: gar:[26681] csw/mgar/pkg/php5/branches/php-5.6.x
Message-ID: <1594996587.84566.17735@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26681
          http://sourceforge.net/p/gar/code/26681
Author:   dmichelsen
Date:     2020-07-17 14:36:26 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
php5/branches/php-5.6.x: Update to 5.6.40 and FPM, placement not fully finished

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
    csw/mgar/pkg/php5/branches/php-5.6.x/checksums

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2020-07-16 08:29:08 UTC (rev 26680)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile	2020-07-17 14:36:26 UTC (rev 26681)
@@ -1,5 +1,5 @@
 NAME = php
-VERSION = 5.6.28
+VERSION = 5.6.40
 GARTYPE = v2
 
 BUNDLE = php5
@@ -18,14 +18,31 @@
 available.
 endef
 
+BUILD64 = 1
+
 EXTRA_MODULATORS = SAPI
 MODULATIONS_SAPI += ap24
 MODULATIONS_SAPI += ap2
+MODULATIONS_SAPI += fpm
 # MODULATIONS_SAPI += cgi
-MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all
 MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
 MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all
+MERGE_SCRIPTS_isa-default-sapi-fpm = copy-all
+MERGE_SCRIPTS_isa-default64-sapi-ap2 = copy-relocate
+MERGE_SCRIPTS_isa-default64-sapi-ap24 = copy-relocate
+MERGE_SCRIPTS_isa-default64-sapi-fpm = copy-relocate
 
+# There is no FPM on SPARC before SPARCV9
+SKIP_MODULATIONS += isa-sparcv8plus-sapi-fpm
+
+# There is not 64 bit package for Apache 2.2
+SKIP_MODULATIONS += isa-sparcv9-sapi-ap2
+SKIP_MODULATIONS += isa-amd64-sapi-ap2
+
+# Just for testing!!!
+#SKIP_MODULATIONS += isa-sparcv8plus-sapi-ap24 isa-sparcv8plus-sapi-ap2
+#SKIP_MODULATIONS += isa-sparcv9-sapi-fpm
+
 # turn on the build scripts to enable/disable modules
 # use the SVR4 class 'build' 
 PHP5_EXT = 1
@@ -36,12 +53,10 @@
 AP2_MODFILES += $(AP2_MODFILES-$(SAPI))
 
 # at least for a decent echo used during build.
-PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH)
+# $(bindir) can contain the 64 bit path
+PATH := /opt/csw/gnu:$(bindir):/opt/csw/bin:$(PATH)
 
-MASTER_SITES += http://de1.php.net/distributions/
-MASTER_SITES += http://downloads.php.net/tyrael/
-MASTER_SITES += http://snaps.php.net/
-# SF_PROJECT  = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
+MASTER_SITES += http://de2.php.net/get/
 
 EXTRA_INSTALL_ENV  = INSTALL_ROOT=$(DESTDIR)
 EXTRA_TEST_ENV  = NO_INTERACTION=1
@@ -90,7 +105,7 @@
 BUILD_DEP_PKGS += CSWlibxpm-dev
 BUILD_DEP_PKGS += CSWlibaspell-dev
 
-PRESERVECONF += $(sysconfdir)/php.ini
+PRESERVECONF += $(sysconfdir)/$(MM_LIBDIR)/php.ini
 PRESERVECONF += $(sysconfdir)/pear.conf
 PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf
 PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf
@@ -101,7 +116,8 @@
 SPKG_DESC_CSWphp5-$(subst _,-,$(1)) ?= The $(1) extention for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-$(subst _,-,$(1)) += CSWphp5 $(2)
 # OBSOLETED_BY_CSWphp5-$(subst _,-,$(1)) ?= CSWphp5$(subst _,-,$(1))
-PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*lib/php/extensions/.*/$(1).so .*php5/extensions/$(1)
+PKGFILES_CSWphp5-$(subst _,-,$(1)) += .*/$(1).so
+PKGFILES_CSWphp5-$(subst _,-,$(1)) += $(includedir)/php/ext/$(1)
 # CHECKPKG_OVERRIDES_CSWphp5-$(subst _,-,$(1)) += surplus-dependency|CSWphp5
 endef
 
@@ -169,8 +185,14 @@
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicui18n57
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc57
 RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio57
-PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.*
+#PKGFILES_CSWap24-modphp5 += $(call baseisadirs,$(prefix)/lib,apache2/modules/libphp5.so)
+PKGFILES_CSWap24-modphp5 += $(prefix)/lib/apache2/modules/libphp5.so
+PKGFILES_CSWap24-modphp5 += $(prefix)/lib/64/apache2/modules/libphp5.so
 PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).*
+#work/solaris10-i386/pkgroot/opt/csw/lib/apache2/modules/libphp5.so
+#work/solaris10-i386/pkgroot/opt/csw/lib/64/apache2/modules/libphp5.so
+
+
 CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24
 CHECKPKG_OVERRIDES_CSWap24-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
 
@@ -236,19 +258,23 @@
 $(eval $(call php5_subpackage,pdo,))
 PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*
 $(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so
+PKGFILES_CSWphp5-pdomysql += .*/lib/extensions/.*/pdo_mysql.so
+PKGFILES_CSWphp5-pdomysql += .*/lib/64/extensions/.*/pdo_mysql.so
 PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql
 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc += .*/lib/extensions/.*/pdo_odbc.so
+PKGFILES_CSWphp5-pdoodbc += .*/lib/64/extensions/.*/pdo_odbc.so
 PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdopgsql,CSWlibpq5 CSWphp5-pdo))
-PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so
+PKGFILES_CSWphp5-pdopgsql += .*/lib/extensions/.*/pdo_pgsql.so
+PKGFILES_CSWphp5-pdopgsql += .*/lib/64/extensions/.*/pdo_pgsql.so
 PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql
 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pdosqlite,CSWphp5-pdo CSWlibsqlite3-0))
-PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so
+PKGFILES_CSWphp5-pdosqlite += .*/lib/extensions/.*/pdo_sqlite.so
+PKGFILES_CSWphp5-pdosqlite += .*/lib/64/extensions/.*/pdo_sqlite.so
 PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite
 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
 $(eval $(call php5_subpackage,pgsql,CSWlibpq5))
@@ -256,7 +282,7 @@
 $(eval $(call php5_subpackage,pspell,CSWlibaspell15))
 RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses6
 RUNTIME_DEP_PKGS_CSWphp5-readline += $(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH))
-$(eval $(call php5_subpackage,readline,CSWlibreadline6))
+$(eval $(call php5_subpackage,readline,CSWlibreadline7))
 $(eval $(call php5_subpackage,session,CSWlibmm))
 PKGFILES_CSWphp5-session += .*/include/php/ext/session.*
 $(eval $(call php5_subpackage,shmop,))
@@ -279,27 +305,26 @@
 $(eval $(call php5_subpackage,zip,CSWlibz1))
 # $(eval $(call php5_subpackage,ibm_db2,))
 
-# Use reinplacement until this is fixed:
-#   https://bugs.php.net/bug.php?id=66298
-#REINPLACEMENTS += dos
-#REINPLACE_MATCH_dos = \r$$
-#REINPLACE_WITH_dos = 
-#REINPLACE_FILES_dos += ext/opcache/Optimizer/zend_optimizer.c
+REINPLACE_USRLOCAL += ext/fileinfo/tests/magic
 
 EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
-EXTRA_LIB = /opt/csw/postgresql/lib
+EXTRA_LIB += /opt/csw/postgresql/lib
 
+# BDB 64 bit libs are in a subdirectory
+EXTRA_LIB += /opt/csw/bdb4/lib
+
 GARCOMPILER = SOS12U4
 # GARCOMPILER = GNU
 
 # We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so,
 # using CC as linker would have made this automatic.
-SUBDIR64-sparc = v9
+SUBDIR64-sparc = sparcv9
 SUBDIR64-i386 = amd64
 #EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
 # EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun
-# /opt/solarisstudio12.4/lib/compilers/
-EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/ -lCrun
+# /opt/solarisstudio12.4/lib/compilers/libCrun.so
+# /opt/solarisstudio12.4/lib/compilers/sparcv9/libCrun.so
+EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/compilers/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCrun
 EXTRA_LD_OPTIONS = -M "$(abspath $(WORKDIR)/map.solaris10)"
 
 NOISALIST = 1
@@ -329,12 +354,31 @@
 #   "/opt/SUNWspro/prod/include/CC/Cstd/rw/traits", line 535: Error: The function "wcsstr" must have a prototype.
 #EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER
 
-sysconfdir = /etc$(prefix)/php5
-sysconfdir_ap24 = /etc$(prefix)/apache2
-sysconfdir_ap2 = $(prefix)/apache2/etc
+sysconfdir = /etc/opt/csw/php5
+sysconfdir_ap2 = /opt/csw/apache2/etc
+sysconfdir_ap24 = /etc/opt/csw/apache2
+sysconfdir_fpm = /etc/opt/csw/apache2
 
-CONFIGURE_ARGS += --prefix=$(prefix)/php5
-CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
+# XXX: TBD review options:
+#   configure: WARNING: unrecognized options: --enable-magic-quotes, --enable-sqlite-utf8, --enable-sqlite3, --with-curlwrappers, --with-exec-dir, --with-sqlite
+
+# Taken out for testing
+exec_prefix = /opt/csw/php5
+
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/bin/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/sbin/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/libexec/$(MM_LIBDIR))
+EXTRA_MERGE_DIRS += $(abspath $(prefix)/lib/$(MM_LIBDIR))
+
+#MERGEBASE_$(bindir)     ?= $(bindir_install)
+#MERGEBASE_$(sbindir)    ?= $(sbindir_install)
+#MERGEBASE_$(libexecdir) ?= $(libexecdir_install)
+#MERGEBASE_$(libdir)     ?= $(libdir_install)
+
+CONFIGURE_ARGS += $(DIRPATHS)
+#CONFIGURE_ARGS += --prefix=$(prefix)/php5
+#CONFIGURE_ARGS += --libdir=$(abspath $(prefix)/php5/lib/$(MM_LIBDIR))
+#CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
 ## build this static, php can not run without it.
 ## it is more efficient to have this built into the php binary
 CONFIGURE_ARGS += --enable-simplexml
@@ -428,17 +472,20 @@
 CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
 CONFIGURE_ARGS += --enable-cli
-CONFIGURE_ARGS_fpm += --enable-fpm
+# We don't have Tokyo Cabinet
+CONFIGURE_ARGS += --without-tcadb
 
-CONFIGURE_ARGS-ap24 += --with-apxs2=$(prefix)/bin/apxs
-CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS-fpm += --enable-fpm
+CONFIGURE_ARGS-ap24 += --with-apxs2=$(abspath $(prefix)/bin/$(MM_BINDIR))/apxs
+CONFIGURE_ARGS-ap2 += --with-apxs2=$(prefix)/apache2/sbin/$(MM_LIBDIR)/apxs
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI))
 
+TEST_TARGET = test
+
 # Disable Tests (report submitted to PHP QA)
 # works, but takes a lot of time
-SKIPTEST = 1
+SKIPTEST ?= 1
 #ENABLE_CHECK = 0
-TEST_TARGET = test
 
 include gar/category.mk
 
@@ -471,31 +518,34 @@
 # 	@echo "LoadModule foo2_module libexec/mod_foo2.so" >> $(DESTDIR)$(AP2SYSCONF)/httpd.conf
 # 	@$(MAKECOOKIE)
 
-post-install-modulated: AP2SYSCONF=$(sysconfdir_$(SAPI))/httpd.conf
-post-install-modulated: AP2EXTCONF=$(sysconfdir_$(SAPI))/extra
-post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
-post-install-modulated:
-	@rm -f $(DESTDIR)$(AP2SYSCONF)
-	@ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF)
-	@ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
-	@ginstall -m 0644 $(WORKSRC)/php.ini-production $(INIDEST)
-	@perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)
-	@ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/
-	@rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f*
-	@perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf*
-	@mkdir -p $(DESTDIR)/opt/csw/bin
-	@( cd $(DESTDIR)/opt/csw/bin; \
+post-install: AP2SYSCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/httpd.conf
+post-install: AP2EXTCONF=$(sysconfdir_$(SAPI))/$(MM_LIBDIR)/extra
+post-install: INIDEST=$(DESTDIR)$(sysconfdir)/$(MM_LIBDIR)/php.ini
+post-install:
+	rm -f $(DESTDIR)$(AP2SYSCONF)
+	ginstall -d -m 0755 $(DESTDIR)$(AP2EXTCONF)
+	ginstall -m 0644 $(WORKDIR)/httpd-php5.conf $(DESTDIR)$(AP2EXTCONF)
+	ginstall -D -m 0644 $(WORKSRC)/php.ini-production $(INIDEST)
+	perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)
+	cat $(WORKDIR)/php.ini.patch | ed -s $(INIDEST)
+	ginstall -D -m 0755 $(WORKDIR)/phpext $(DESTDIR)$(bindir)/phpext
+	rm -rf $(DESTDIR)/.cha* $(DESTDIR)/.dep* $(DESTDIR)/.reg* $(DESTDIR)/.l* $(DESTDIR)/.f*
+	perl -pi -e 's!s:17:"http://proxy:3128!s:0:"!' $(DESTDIR)$(sysconfdir)/pear.conf*
+	mkdir -p $(DESTDIR)$(prefix)/bin/$(MM_BINDIR)
+	( cd $(DESTDIR)$(prefix)/bin/$(MM_BINDIR); \
 	   for f in pear peardev pecl phar php php-config; do \
-		ln -s ../php5/bin/$$f $$f; \
+		ln -s $(if $(filter 64,$(MEMORYMODEL)),../../php5/bin/$(MM_BINDIR)/$$f,../php5/bin/$$f) $$f; \
 	   done )
 	@$(MAKECOOKIE)
 
 post-merge-all:
-	@echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so support"
-	cat $(WORKDIR)/php.ini.patch | ed -s $(PKGROOT)/$(sysconfdir)/php.ini.CSW 
+	gln -s . $(PKGROOT)$(libdir)/32
+	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
 	@$(MAKECOOKIE)
 
-post-merge-modulated:
-	@echo "merge for $(SAPI)"
-	@echo "preserve $(PRESERVECONF)"
-	@$(MAKECOOKIE)	
+
+#post-merge-all:
+#	@echo " ==> Fixing php.ini: adding loadable session.so ctype.so phar.so support"
+#	cat $(WORKDIR)/php.ini.patch | ed -s $(PKGROOT)/$(sysconfdir)/php.ini.CSW 
+#	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/checksums	2020-07-16 08:29:08 UTC (rev 26680)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums	2020-07-17 14:36:26 UTC (rev 26681)
@@ -1 +1 @@
-1e01c66b2e67ab3b56a6180ee560fe4c  php-5.6.28.tar.xz
+c7dde3afb16ce7b761abf2805125d372  php-5.6.40.tar.xz

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


From dmichelsen at users.sourceforge.net  Wed Jul 22 18:14:20 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 22 Jul 2020 16:14:20 +0000
Subject: SF.net SVN: gar:[26682] csw/mgar/pkg/sudo/trunk
Message-ID: <1595434460.496815.9896@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26682
          http://sourceforge.net/p/gar/code/26682
Author:   dmichelsen
Date:     2020-07-22 16:14:20 +0000 (Wed, 22 Jul 2020)
Log Message:
-----------
sudo/trunk: Update to 1.9.2

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2020-07-17 14:36:26 UTC (rev 26681)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2020-07-22 16:14:20 UTC (rev 26682)
@@ -2,7 +2,7 @@
 #
 
 NAME = sudo
-VERSION = 1.9.1
+VERSION = 1.9.2
 GARTYPE = v2
 
 EXTRA_MODULATORS = LDAP

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2020-07-17 14:36:26 UTC (rev 26681)
+++ csw/mgar/pkg/sudo/trunk/checksums	2020-07-22 16:14:20 UTC (rev 26682)
@@ -1 +1 @@
-fd95682cbbe929fda7bbe93730934c98  sudo-1.9.1.tar.gz
+5f3ab41580fb1edf7cae2935c21e0719  sudo-1.9.2.tar.gz

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


From dmichelsen at users.sourceforge.net  Fri Jul 24 16:16:56 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 24 Jul 2020 14:16:56 +0000
Subject: SF.net SVN: gar:[26683] csw/mgar/pkg/libmpfr/trunk
Message-ID: <1595600216.996984.11147@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26683
          http://sourceforge.net/p/gar/code/26683
Author:   dmichelsen
Date:     2020-07-24 14:16:56 +0000 (Fri, 24 Jul 2020)
Log Message:
-----------
libmpfr/trunk: Update to 4.1.0

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

Modified: csw/mgar/pkg/libmpfr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpfr/trunk/Makefile	2020-07-22 16:14:20 UTC (rev 26682)
+++ csw/mgar/pkg/libmpfr/trunk/Makefile	2020-07-24 14:16:56 UTC (rev 26683)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = mpfr
-VERSION = 4.0.0
+VERSION = 4.1.0
 GARTYPE = v2
 
 DESCRIPTION = GNU Multiple Precision floating-point arithmetic library
@@ -19,12 +19,10 @@
 PACKAGING_PLATFORMS += solaris11-sparc
 PKGFORMAT-5.11 = svr4
 
-MASTER_SITES += http://www.mpfr.org/mpfr-current/
+MASTER_SITES += http://www.mpfr.org/mpfr-4.1.0/
 # DISTNAME = $(NAME)-$(VERSION)-rc1
 DISTFILES  = $(DISTNAME).tar.xz
 
-UPSTREAM_MASTER_SITES = http://www.mpfr.org/mpfr-current/
-
 BUILD_DEP_PKGS = CSWlibgmp-dev
 
 BUILD64_LIBS_ONLY = 1
@@ -35,29 +33,15 @@
 # With the default -xO3, there are failing unit tests.
 OPT_FLAGS_SOS = -xO2
 
-# GCC4_CC_HOME = /opt/csw/gcc4
-# GCC4_CC = $(GCC4_CC_HOME)/bin/gcc
-# GCC4_CXX = $(GCC4_CC_HOME)/bin/g++
-# prefix = $(HOME)/usr-$(GARCH)-$(GAROSREL)
-# EXTRA_INC = $(prefix)/include
-# EXTRA_INC += $(BUILD_PREFIX)/include
-# # For linking against the old gcc
-# EXTRA_LIB = $(prefix)/gcc4/lib
-
 PACKAGES += CSWlibmpfr6
 PKGFILES_CSWlibmpfr6 += $(call pkgfiles_lib,libmpfr.so.6)
 SPKG_DESC_CSWlibmpfr6 += $(DESCRIPTION), libmpfr.so.4
 RUNTIME_DEP_PKGS_CSWlibmpfr6 += CSWlibgmp10
-CHECKPKG_OVERRIDES_CSWlibmpfr6 += no-direct-binding
 
 PACKAGES += CSWlibmpfr-dev
 SPKG_DESC_CSWlibmpfr-dev = MPFR development files
 RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr6
 
-# It's only documentation.
-CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info
-CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html
-
 # The LD_OPTIONS setting breaks the test suite, because it makes
 # /opt/csw/lib/$ISALIST be always in front, while the tests require a local
 # directory be in front instead.

Modified: csw/mgar/pkg/libmpfr/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmpfr/trunk/checksums	2020-07-22 16:14:20 UTC (rev 26682)
+++ csw/mgar/pkg/libmpfr/trunk/checksums	2020-07-24 14:16:56 UTC (rev 26683)
@@ -1 +1 @@
-94c67b3cfbee10605a5e59d0ed9161db  mpfr-4.0.0.tar.xz
+bdd3d5efba9c17da8d83a35ec552baef  mpfr-4.1.0.tar.xz

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


From dmichelsen at users.sourceforge.net  Sun Jul 26 15:45:28 2020
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 26 Jul 2020 13:45:28 +0000
Subject: SF.net SVN: gar:[26684] csw/mgar/pkg/libmpfr/trunk/Makefile
Message-ID: <1595771128.229469.29723@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26684
          http://sourceforge.net/p/gar/code/26684
Author:   dmichelsen
Date:     2020-07-26 13:45:27 +0000 (Sun, 26 Jul 2020)
Log Message:
-----------
libmpfr/trunk: Fix typo

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

Modified: csw/mgar/pkg/libmpfr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpfr/trunk/Makefile	2020-07-24 14:16:56 UTC (rev 26683)
+++ csw/mgar/pkg/libmpfr/trunk/Makefile	2020-07-26 13:45:27 UTC (rev 26684)
@@ -35,7 +35,7 @@
 
 PACKAGES += CSWlibmpfr6
 PKGFILES_CSWlibmpfr6 += $(call pkgfiles_lib,libmpfr.so.6)
-SPKG_DESC_CSWlibmpfr6 += $(DESCRIPTION), libmpfr.so.4
+SPKG_DESC_CSWlibmpfr6 += $(DESCRIPTION), libmpfr.so.6
 RUNTIME_DEP_PKGS_CSWlibmpfr6 += CSWlibgmp10
 
 PACKAGES += CSWlibmpfr-dev

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