From dmichelsen at users.sourceforge.net  Thu Feb  1 07:59:22 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Feb 2018 06:59:22 +0000
Subject: SF.net SVN: gar:[26349] csw/mgar/pkg/curl/trunk/Makefile
Message-ID: <1517468362.200630.11120@sfp-scm-5.v30.ch3.sourceforge.com>

Revision: 26349
          http://sourceforge.net/p/gar/code/26349
Author:   dmichelsen
Date:     2018-02-01 06:59:21 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
curl/trunk: Add feature dependences to libbrotlidec.so

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

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2018-01-31 16:55:33 UTC (rev 26348)
+++ csw/mgar/pkg/curl/trunk/Makefile	2018-02-01 06:59:21 UTC (rev 26349)
@@ -60,6 +60,7 @@
 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibpsl5
 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibnghttp2-14
 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibidn2-0
+RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibbrotlidec1  
 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibk5crypto3
 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcom-err3
 # Without the base lib the feature lib is not pulled in

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 Feb  1 13:04:44 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Feb 2018 12:04:44 +0000
Subject: SF.net SVN: gar:[26350] csw/mgar/pkg/tomcat8/trunk
Message-ID: <1517486684.369819.19133@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26350
          http://sourceforge.net/p/gar/code/26350
Author:   dmichelsen
Date:     2018-02-01 12:04:43 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
tomcat8/trunk: Update to 8.0.49

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	2018-02-01 06:59:21 UTC (rev 26349)
+++ csw/mgar/pkg/tomcat8/trunk/Makefile	2018-02-01 12:04:43 UTC (rev 26350)
@@ -1,5 +1,5 @@
 NAME = apache-tomcat
-VERSION = 8.0.44
+VERSION = 8.0.49
 
 DESCRIPTION = Apache Jakarta Tomcat 8 Servlet/JSP Container
 

Modified: csw/mgar/pkg/tomcat8/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/checksums	2018-02-01 06:59:21 UTC (rev 26349)
+++ csw/mgar/pkg/tomcat8/trunk/checksums	2018-02-01 12:04:43 UTC (rev 26350)
@@ -1 +1 @@
-67e1fd1b1b9d65510d65c9e9d1a440f4  apache-tomcat-8.0.44.tar.gz
+eafee0feec03d0e0d769d72a8a18654b  apache-tomcat-8.0.49.tar.gz

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


From dmichelsen at users.sourceforge.net  Thu Feb  1 13:08:14 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Feb 2018 12:08:14 +0000
Subject: SF.net SVN: gar:[26351] csw/mgar/pkg
Message-ID: <1517486894.542150.20364@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26351
          http://sourceforge.net/p/gar/code/26351
Author:   dmichelsen
Date:     2018-02-01 12:08:14 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
tomcat9: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/tomcat9/
    csw/mgar/pkg/tomcat9/trunk/Makefile
    csw/mgar/pkg/tomcat9/trunk/checksums
    csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9

Removed Paths:
-------------
    csw/mgar/pkg/tomcat9/trunk/Makefile
    csw/mgar/pkg/tomcat9/trunk/checksums
    csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8

Deleted: csw/mgar/pkg/tomcat9/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/Makefile	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/Makefile	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1,68 +0,0 @@
-NAME = apache-tomcat
-VERSION = 8.0.27
-
-DESCRIPTION = Apache Jakarta Tomcat 8 Servlet/JSP Container
-
-MASTER_SITES = http://ftp.fau.de/apache/tomcat/tomcat-8/v$(VERSION)/bin/
-DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswusergroup
-DISTFILES += cswtomcat8
-#DISTFILES    += LICENSE
-NOGITPATCH    = 1
-
-VENDOR_URL = http://tomcat.apache.org/
-
-PACKAGES += CSWtomcat8
-SPKG_DESC_CSWtomcat8 = Apache Jakarta Tomcat 8 Servlet/JSP Container
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWtomcat += CSWjre8
-ARCHALL_CSWtomcat8 = 1
-
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
-TEST_SCRIPTS =
-INSTALL_SCRIPTS = tomcat
-
-INITSMF = /etc/opt/csw/init.d/cswtomcat8
-USERGROUP = /etc/opt/csw/pkg/CSWtomcat8/cswusergroup
-PRESERVECONF = /etc/opt/csw/tomcat8/conf/.*
-
-PROTOTYPE_MODIFIERS += varuser
-PROTOTYPE_FILES_varuser = /var/opt/csw/tomcat8/.*
-PROTOTYPE_USER_varuser  = tomcat
-PROTOTYPE_GROUP_varuser = tomcat
-PROTOTYPE_CLASS_varuser = ugfiles
-
-PROTOTYPE_MODIFIERS += etcperm
-PROTOTYPE_FILES_etcperm = /etc/opt/csw/tomcat8/conf/.*\.CSW
-PROTOTYPE_PERMS_etcperm = 0640
-PROTOTYPE_USER_etcperm  = tomcat
-PROTOTYPE_GROUP_etcperm = tomcat
-
-include gar/category.mk
-
-xpost-extract:
-	( for i in temp work logs conf ; do  find $(WORKSRC)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKSRC)/$$i -type f -exec chmod 0640 {} \; ; done )
-	@$(MAKECOOKIE)
-
-install-tomcat:
-	mkdir -p $(DESTDIR)/etc/opt/csw/init.d
-	mkdir -p $(DESTDIR)/etc/opt/csw/pkg/tomcat8
-	mkdir -p $(DESTDIR)/etc/opt/csw/tomcat8
-	mkdir -p $(DESTDIR)/opt/csw/etc/tomcat8
-	mkdir -p $(DESTDIR)/var/opt/csw/tomcat8
-	mkdir -p $(DESTDIR)/opt/csw/share
-	cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/conf $(DESTDIR)/etc/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/logs $(DESTDIR)/var/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/work $(DESTDIR)/var/opt/csw/tomcat8
-	mv $(DESTDIR)/opt/csw/share/tomcat8/temp $(DESTDIR)/var/opt/csw/tomcat8
-	ln -s ../../../../etc/opt/csw/tomcat8/conf $(DESTDIR)/opt/csw/share/tomcat8/conf
-	ln -s ../../../../var/opt/csw/tomcat8/logs $(DESTDIR)/opt/csw/share/tomcat8/logs
-	ln -s ../../../../var/opt/csw/tomcat8/work $(DESTDIR)/opt/csw/share/tomcat8/work
-	ln -s ../../../../var/opt/csw/tomcat8/temp $(DESTDIR)/opt/csw/share/tomcat8/temp
-	rm $(DESTDIR)/var/opt/csw/tomcat8/temp/safeToDelete.tmp
-	#cp -fr $(WORKDIR)/cswtomcat8 $(DESTDIR)/etc/opt/csw/init.d
-	ginstall -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
-	@$(MAKECOOKIE)
-

Copied: csw/mgar/pkg/tomcat9/trunk/Makefile (from rev 26232, csw/mgar/pkg/tomcat8/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/Makefile	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1,68 @@
+NAME = apache-tomcat
+VERSION = 9.0.4
+
+DESCRIPTION = Apache Jakarta Tomcat 9 Servlet/JSP Container
+
+MASTER_SITES = http://ftp.fau.de/apache/tomcat/tomcat-9/v$(VERSION)/bin/
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += cswusergroup
+DISTFILES += cswtomcat9
+#DISTFILES    += LICENSE
+NOGITPATCH    = 1
+
+VENDOR_URL = http://tomcat.apache.org/
+
+PACKAGES += CSWtomcat9
+SPKG_DESC_CSWtomcat9 = Apache Jakarta Tomcat 9 Servlet/JSP Container
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtomcat += CSWjre8
+ARCHALL_CSWtomcat9 = 1
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = tomcat
+
+INITSMF = /etc/opt/csw/init.d/cswtomcat9
+USERGROUP = /etc/opt/csw/pkg/CSWtomcat9/cswusergroup
+PRESERVECONF = /etc/opt/csw/tomcat9/conf/.*
+
+PROTOTYPE_MODIFIERS += varuser
+PROTOTYPE_FILES_varuser = /var/opt/csw/tomcat9/.*
+PROTOTYPE_USER_varuser  = tomcat
+PROTOTYPE_GROUP_varuser = tomcat
+PROTOTYPE_CLASS_varuser = ugfiles
+
+PROTOTYPE_MODIFIERS += etcperm
+PROTOTYPE_FILES_etcperm = /etc/opt/csw/tomcat9/conf/.*\.CSW
+PROTOTYPE_PERMS_etcperm = 0640
+PROTOTYPE_USER_etcperm  = tomcat
+PROTOTYPE_GROUP_etcperm = tomcat
+
+include gar/category.mk
+
+xpost-extract:
+	( for i in temp work logs conf ; do  find $(WORKSRC)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKSRC)/$$i -type f -exec chmod 0640 {} \; ; done )
+	@$(MAKECOOKIE)
+
+install-tomcat:
+	mkdir -p $(DESTDIR)/etc/opt/csw/init.d
+	mkdir -p $(DESTDIR)/etc/opt/csw/pkg/tomcat9
+	mkdir -p $(DESTDIR)/etc/opt/csw/tomcat9
+	mkdir -p $(DESTDIR)/opt/csw/etc/tomcat9
+	mkdir -p $(DESTDIR)/var/opt/csw/tomcat9
+	mkdir -p $(DESTDIR)/opt/csw/share
+	cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/conf $(DESTDIR)/etc/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/logs $(DESTDIR)/var/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/work $(DESTDIR)/var/opt/csw/tomcat9
+	mv $(DESTDIR)/opt/csw/share/tomcat9/temp $(DESTDIR)/var/opt/csw/tomcat9
+	ln -s ../../../../etc/opt/csw/tomcat9/conf $(DESTDIR)/opt/csw/share/tomcat9/conf
+	ln -s ../../../../var/opt/csw/tomcat9/logs $(DESTDIR)/opt/csw/share/tomcat9/logs
+	ln -s ../../../../var/opt/csw/tomcat9/work $(DESTDIR)/opt/csw/share/tomcat9/work
+	ln -s ../../../../var/opt/csw/tomcat9/temp $(DESTDIR)/opt/csw/share/tomcat9/temp
+	rm $(DESTDIR)/var/opt/csw/tomcat9/temp/safeToDelete.tmp
+	#cp -fr $(WORKDIR)/cswtomcat9 $(DESTDIR)/etc/opt/csw/init.d
+	ginstall -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
+	@$(MAKECOOKIE)
+

Deleted: csw/mgar/pkg/tomcat9/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/checksums	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/checksums	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1 +0,0 @@
-a20be33bfb31a2c6e2eca755fb211cb9  apache-tomcat-8.0.27.tar.gz

Copied: csw/mgar/pkg/tomcat9/trunk/checksums (from rev 26232, csw/mgar/pkg/tomcat8/trunk/checksums)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/checksums	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1 @@
+079b1c9316ce12566d4c3993fb9165ea  apache-tomcat-9.0.4.tar.gz

Deleted: csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8
===================================================================
--- csw/mgar/pkg/tomcat8/trunk/files/cswtomcat8	2016-07-06 11:21:51 UTC (rev 25802)
+++ csw/mgar/pkg/tomcat9/trunk/files/cswtomcat8	2018-02-01 12:08:14 UTC (rev 26351)
@@ -1,143 +0,0 @@
-#!/sbin/sh
-
-##################################################################
-#
-# Configuration file documentation
-#
-# tomcat8
-#
-#     This file let you change the values of a few variables used 
-#     by the init script to control the environment of tomcat6
-#     The list of variables is described below.
-#
-#     The configuration file can be stored in two different path :
-#
-#     /etc/opt/csw
-#         This directory contain machine specific config files
-#
-#     /opt/csw/etc
-#         This directory contain global config files
-#
-#     If there exist a /etc/opt/csw/tomcat8 config file, then the
-#     environment variables defined in this file are used and the
-#     /opt/csw/etc/tomcat6/conf/tomcat6 file is ignored even if it 
-#     exist.
-#
-#     If there exist only a /opt/csw/etc/tomcat8/conf/tomcat8 config
-#     file, then the environnement variables defined in this file are
-#     used.
-#
-#     If no configuration file exist, all the variables needed by
-#     tomcat6 are let to their default values (see the values 
-#     below).
-#
-#     In all cases, the default values are defined, and supereded
-#     by the values stored in the configuration file. This is 
-#     necessary to define an environment usuable by tomcat.
-# 
-# Environment variables documentation
-#
-# JAVA_HOME
-#
-#     JAVA_HOME specify which version of Java should be used
-#     by tomcat. You can supered the default value in the tomcat6
-#     configuration file. The value of this variable must be a path
-#     pointing to the root of a valid JRE or JDK (the root dir not
-#     the bin dir !). The default value is /usr/java.
-#
-# TOMCAT_USER
-#
-#     TOMCAT_USER variable defines the Solaris user running the 
-#     tomcat server. You can supered the default valude in the 
-#     tomcat6 configuration file. The value of this variable must 
-#     be a valid Solaris user (ie: root, nobody). The default value
-#     is root.
-#
-#     WARNING : By default the directory permissions are set for
-#     the root user (no write access for 'nobody').
-#     The logs are stored in /opt/csw/share/tomcat6/logs, and do belong
-#     to root user. If you change the TOMCAT_USER, be sure that this
-#     user can write in the log directory.
-#
-#     The following permissions may also have to be changed :
-#     . give read access to the conf directory and all its subdirs
-#     . give write access to the conf dir to let tomcat create new files
-#     . give write access to the work dir
-#
-
-##################################################################
-# Setting the default values
-#
-# DO NOT EDIT THE FOLLOWING VALUES. 
-#
-# Use the configuration file to supered their value
-#
-
-SPECIFIC_CONFIG_FILE=/etc/opt/csw/cswtomcat8
-GLOBAL_CONFIG_FILE=/opt/csw/etc/cswtomcat8
-
-JAVA_HOME=/usr/java
-TOMCAT_USER=tomcat
-
-##################################################################
-# Search for a custom configuration file in the default CSW paths
-#
-
-if [ -f $SPECIFIC_CONFIG_FILE ]
-then
-	echo Using configuration file : $SPECIFIC_CONFIG_FILE
-        . $SPECIFIC_CONFIG_FILE
-else
-        if [ -f $GLOBAL_CONFIG_FILE ]
-        then
-		echo Using configuration file : $GLOBAL_CONFIG_FILE
-                . $GLOBAL_CONFIG_FILE
-	fi
-fi
-
-echo "Using Java from : $JAVA_HOME"
-echo "Running as : $TOMCAT_USER (please see documentation included in $0 to change user)"
-
-##################################################################
-# Test if java is in the path defined by JAVA_HOME, if not try to 
-# guess path by testing standard directories
-#
-
-if [ ! -f $JAVA_HOME/bin/java ]
-then
-        echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin"
-        JAVA_HOME=/usr/java
-        if [ ! -f $JAVA_HOME/bin/java ]
-        then
-                echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin"
-                JAVA_HOME=/usr/j2se
-                if [ ! -f $JAVA_HOME/bin/java ]
-                then
-                        echo "Java not found in $JAVA_HOME/bin"
-                        echo "Java not found !"
-                        exit 1
-                fi
-        fi
-fi
-
-CATALINA_HOME=/opt/csw/share/tomcat8
-export JAVA_HOME
-export CATALINA_HOME
-
-case $1 in 
-'start')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
-        ;;
-'stop')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
-        ;;
-
-'restart')
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
-	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
-        ;;
-*)
-        echo "Usage: $0 { start | stop | restart }"
-        exit 1
-        ;;
-esac    

Copied: csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9 (from rev 25802, csw/mgar/pkg/tomcat8/trunk/files/cswtomcat8)
===================================================================
--- csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9	                        (rev 0)
+++ csw/mgar/pkg/tomcat9/trunk/files/cswtomcat9	2018-02-01 12:08:14 UTC (rev 26351)
@@ -0,0 +1,143 @@
+#!/sbin/sh
+
+##################################################################
+#
+# Configuration file documentation
+#
+# tomcat9
+#
+#     This file let you change the values of a few variables used 
+#     by the init script to control the environment of tomcat6
+#     The list of variables is described below.
+#
+#     The configuration file can be stored in two different path :
+#
+#     /etc/opt/csw
+#         This directory contain machine specific config files
+#
+#     /opt/csw/etc
+#         This directory contain global config files
+#
+#     If there exist a /etc/opt/csw/tomcat9 config file, then the
+#     environment variables defined in this file are used and the
+#     /opt/csw/etc/tomcat6/conf/tomcat6 file is ignored even if it 
+#     exist.
+#
+#     If there exist only a /opt/csw/etc/tomcat9/conf/tomcat9 config
+#     file, then the environnement variables defined in this file are
+#     used.
+#
+#     If no configuration file exist, all the variables needed by
+#     tomcat6 are let to their default values (see the values 
+#     below).
+#
+#     In all cases, the default values are defined, and supereded
+#     by the values stored in the configuration file. This is 
+#     necessary to define an environment usuable by tomcat.
+# 
+# Environment variables documentation
+#
+# JAVA_HOME
+#
+#     JAVA_HOME specify which version of Java should be used
+#     by tomcat. You can supered the default value in the tomcat6
+#     configuration file. The value of this variable must be a path
+#     pointing to the root of a valid JRE or JDK (the root dir not
+#     the bin dir !). The default value is /usr/java.
+#
+# TOMCAT_USER
+#
+#     TOMCAT_USER variable defines the Solaris user running the 
+#     tomcat server. You can supered the default valude in the 
+#     tomcat6 configuration file. The value of this variable must 
+#     be a valid Solaris user (ie: root, nobody). The default value
+#     is root.
+#
+#     WARNING : By default the directory permissions are set for
+#     the root user (no write access for 'nobody').
+#     The logs are stored in /opt/csw/share/tomcat6/logs, and do belong
+#     to root user. If you change the TOMCAT_USER, be sure that this
+#     user can write in the log directory.
+#
+#     The following permissions may also have to be changed :
+#     . give read access to the conf directory and all its subdirs
+#     . give write access to the conf dir to let tomcat create new files
+#     . give write access to the work dir
+#
+
+##################################################################
+# Setting the default values
+#
+# DO NOT EDIT THE FOLLOWING VALUES. 
+#
+# Use the configuration file to supered their value
+#
+
+SPECIFIC_CONFIG_FILE=/etc/opt/csw/cswtomcat9
+GLOBAL_CONFIG_FILE=/opt/csw/etc/cswtomcat9
+
+JAVA_HOME=/usr/java
+TOMCAT_USER=tomcat
+
+##################################################################
+# Search for a custom configuration file in the default CSW paths
+#
+
+if [ -f $SPECIFIC_CONFIG_FILE ]
+then
+	echo Using configuration file : $SPECIFIC_CONFIG_FILE
+        . $SPECIFIC_CONFIG_FILE
+else
+        if [ -f $GLOBAL_CONFIG_FILE ]
+        then
+		echo Using configuration file : $GLOBAL_CONFIG_FILE
+                . $GLOBAL_CONFIG_FILE
+	fi
+fi
+
+echo "Using Java from : $JAVA_HOME"
+echo "Running as : $TOMCAT_USER (please see documentation included in $0 to change user)"
+
+##################################################################
+# Test if java is in the path defined by JAVA_HOME, if not try to 
+# guess path by testing standard directories
+#
+
+if [ ! -f $JAVA_HOME/bin/java ]
+then
+        echo "Java not found in $JAVA_HOME/bin. Trying /usr/java/bin"
+        JAVA_HOME=/usr/java
+        if [ ! -f $JAVA_HOME/bin/java ]
+        then
+                echo "Java not found in $JAVA_HOME/bin. Trying /usr/j2se/bin"
+                JAVA_HOME=/usr/j2se
+                if [ ! -f $JAVA_HOME/bin/java ]
+                then
+                        echo "Java not found in $JAVA_HOME/bin"
+                        echo "Java not found !"
+                        exit 1
+                fi
+        fi
+fi
+
+CATALINA_HOME=/opt/csw/share/tomcat9
+export JAVA_HOME
+export CATALINA_HOME
+
+case $1 in 
+'start')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
+        ;;
+'stop')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
+        ;;
+
+'restart')
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/shutdown.sh
+	/bin/su $TOMCAT_USER -c $CATALINA_HOME/bin/startup.sh
+        ;;
+*)
+        echo "Usage: $0 { start | stop | restart }"
+        exit 1
+        ;;
+esac    

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 Feb  1 15:03:15 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Feb 2018 14:03:15 +0000
Subject: SF.net SVN: gar:[26352] csw/mgar/pkg/nginx/trunk
Message-ID: <1517493795.223550.14644@sfp-scm-3.v30.ch3.sourceforge.com>

Revision: 26352
          http://sourceforge.net/p/gar/code/26352
Author:   dmichelsen
Date:     2018-02-01 14:03:14 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
nginx/trunk: Update to 1.13.8

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	2018-02-01 12:08:14 UTC (rev 26351)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2018-02-01 14:03:14 UTC (rev 26352)
@@ -1,5 +1,5 @@
 NAME = nginx
-VERSION = 1.13.4
+VERSION = 1.13.8
 GARTYPE = v2
 
 DESCRIPTION = HTTP server and mail proxy server

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2018-02-01 12:08:14 UTC (rev 26351)
+++ csw/mgar/pkg/nginx/trunk/checksums	2018-02-01 14:03:14 UTC (rev 26352)
@@ -1 +1 @@
-42a3ca70cd292a149ba4f60862599245  nginx-1.13.4.tar.gz
+df4be9294365782dc1349ca33ce8c4ac  nginx-1.13.8.tar.gz

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


From dmichelsen at users.sourceforge.net  Thu Feb  1 18:31:13 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 01 Feb 2018 17:31:13 +0000
Subject: SF.net SVN: gar:[26353] csw/mgar/pkg/ncurses/trunk
Message-ID: <1517506273.166811.12396@sfp-scm-6.v30.ch3.sourceforge.com>

Revision: 26353
          http://sourceforge.net/p/gar/code/26353
Author:   dmichelsen
Date:     2018-02-01 17:31:12 +0000 (Thu, 01 Feb 2018)
Log Message:
-----------
ncurses/trunk: Update to 6.1

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

Modified: csw/mgar/pkg/ncurses/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ncurses/trunk/Makefile	2018-02-01 14:03:14 UTC (rev 26352)
+++ csw/mgar/pkg/ncurses/trunk/Makefile	2018-02-01 17:31:12 UTC (rev 26353)
@@ -6,7 +6,7 @@
 #     https://plus.google.com/105567297772267099132/posts/Bv5GSTQvfzC
 
 NAME = ncurses
-VERSION = 6.0
+VERSION = 6.1
 GARTYPE = v2
 
 define BLURB

Modified: csw/mgar/pkg/ncurses/trunk/checksums
===================================================================
--- csw/mgar/pkg/ncurses/trunk/checksums	2018-02-01 14:03:14 UTC (rev 26352)
+++ csw/mgar/pkg/ncurses/trunk/checksums	2018-02-01 17:31:12 UTC (rev 26353)
@@ -1 +1 @@
-ee13d052e1ead260d7c28071f46eefb1  ncurses-6.0.tar.gz
+98c889aaf8d23910d2b92d65be2e737a  ncurses-6.1.tar.gz

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


From dmichelsen at users.sourceforge.net  Tue Feb  6 12:46:33 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 06 Feb 2018 11:46:33 +0000
Subject: SF.net SVN: gar:[26354] csw/mgar/pkg/nrpe/trunk
Message-ID: <1517917593.427506.21910@sfp-scm-5.v30.ch3.sourceforge.com>

Revision: 26354
          http://sourceforge.net/p/gar/code/26354
Author:   dmichelsen
Date:     2018-02-06 11:46:33 +0000 (Tue, 06 Feb 2018)
Log Message:
-----------
nrpe/trunk: Update to 3.2.1

Modified Paths:
--------------
    csw/mgar/pkg/nrpe/trunk/Makefile
    csw/mgar/pkg/nrpe/trunk/checksums
    csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch

Removed Paths:
-------------
    csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch

Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile	2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/Makefile	2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,5 +1,5 @@
 NAME = nrpe
-VERSION = 2.15
+VERSION = 3.2.1
 GARTYPE = v2
 
 define BLURB
@@ -19,16 +19,15 @@
 PATCHFILES_isa-sparcv8plus-size-8k += 0002-changing-packetbuffer-length-to-8k.patch
 PATCHFILES_isa-pentium_pro-size-8k += 0002-changing-packetbuffer-length-to-8k.patch
 
-PATCHFILES += 0003-change_dh_param_to_2048.patch
-
 LICENSE = LEGAL
 
 EXTRA_MODULATORS = SIZE
 MODULATIONS_SIZE = 1k 8k
 
-REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY
-REINPLACE_USRLOCAL += .*/nrpe-2.15/README
 REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in
+# Default path:
+#   *path = "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+REINPLACE_USRLOCAL += src/utils.c
 
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
@@ -67,12 +66,13 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl-lib=$(libdir)
 CONFIGURE_ARGS += --with-ssl-inc=$(includedir)
-CONFIGURE_ARGS += --with-ssl-dir=$(bindir)
 CONFIGURE_ARGS += --with-kerberos-inc=$(includedir)
 CONFIGURE_ARGS += --enable-command-args
 
-INSTALL_ARGS = install-daemon-config
+BUILD_ARGS = all
 
+INSTALL_ARGS = install-daemon install-config
+
 # There is no testsuite
 TEST_SCRIPTS =
 
@@ -91,7 +91,7 @@
 
 include gar/category.mk
 
-pre-configure:
+xpre-configure:
 	@# This is because of patch 0003-change_dh_param_to_2048.patch
 	cd $(WORKSRC) && autoconf
 	@$(MAKECOOKIE)
@@ -102,9 +102,9 @@
 	ginstall -m 644 $(WORKDIR)/README_8k $(DESTDIR)$(DOCDIR)
 	ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
 	ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR)
-	ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR)
-	ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
-	ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/README.md $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/README.SSL.md $(DESTDIR)$(DOCDIR)
+	ginstall -m 644 $(WORKSRC)/SECURITY.md $(DESTDIR)$(DOCDIR)
 	ginstall -D -m 755 $(WORKDIR)/cswnrpe $(DESTDIR)$(sysconfdir)/init.d/cswnrpe
 	ginstall -D -m 644 $(WORKDIR)/cswusergroup $(DESTDIR)$(USERGROUP)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums	2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/checksums	2018-02-06 11:46:33 UTC (rev 26354)
@@ -1 +1 @@
-3921ddc598312983f604541784b35a50  nrpe-2.15.tar.gz
+8997e195fea93cdceb8c7ed8ac1d43bc  nrpe-3.2.1.tar.gz

Modified: csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch	2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/files/0002-changing-packetbuffer-length-to-8k.patch	2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,34 +1,34 @@
-From 3aaf73298717337b2002ae64d843d1342778c370 Mon Sep 17 00:00:00 2001
-From: Juergen Arndt <ja at opencsw.org>
-Date: Tue, 28 Feb 2012 14:43:46 +0100
+From 93f765175addce1d16d1379f6ad49d1d5433f848 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 6 Feb 2018 12:07:08 +0100
 Subject: [PATCH] changing packetbuffer length to 8k
 
 ---
- include/common.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ include/common.h.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/include/common.h b/include/common.h
-index fb3b429..6591d10 100755
---- a/include/common.h
-+++ b/include/common.h
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT	10	/* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300	/* timeout if daemon is waiting for connection more than this time */
+diff --git a/include/common.h.in b/include/common.h.in
+index 90f6272..53281dd 100644
+--- a/include/common.h.in
++++ b/include/common.h.in
+@@ -55,7 +55,7 @@
+ #define DEFAULT_SOCKET_TIMEOUT		10		/* timeout after 10 seconds */
+ #define DEFAULT_CONNECTION_TIMEOUT	300		/* timeout if daemon is waiting for connection more than this time */
  
--#define MAX_INPUT_BUFFER	2048	/* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER	8192	/* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH     256
+-#define MAX_INPUT_BUFFER			2048	/* max size of most buffers we use */
++#define MAX_INPUT_BUFFER			8192	/* max size of most buffers we use */
+ #define MAX_FILENAME_LENGTH			256
+ #define MAX_HOST_ADDRESS_LENGTH		256		/* max size of a host address */
+ #define MAX_COMMAND_ARGUMENTS		16
+@@ -70,7 +70,7 @@
+ #define NRPE_PACKET_VERSION_2		2
+ #define NRPE_PACKET_VERSION_1		1		/* older packet version identifiers (no longer supported) */
  
- #define MAX_HOST_ADDRESS_LENGTH	256	/* max size of a host address */
-@@ -60,7 +60,7 @@
- #define NRPE_PACKET_VERSION_2   2               
- #define NRPE_PACKET_VERSION_1	1		/* older packet version identifiers (no longer supported) */
+-#define MAX_PACKETBUFFER_LENGTH		1024	/* amount of data to send in one query/response vor version 2 */
++#define MAX_PACKETBUFFER_LENGTH		8192	/* amount of data to send in one query/response vor version 2 */
  
--#define MAX_PACKETBUFFER_LENGTH	1024		/* max amount of data we'll send in one query/response */
-+#define MAX_PACKETBUFFER_LENGTH	8192		/* max amount of data we'll send in one query/response */
- 
- typedef struct packet_struct{
- 	int16_t   packet_version;
+ typedef struct _v2_packet {
+ 	int16_t		packet_version;
 -- 
-1.7.9
+2.4.0
 

Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch	2018-02-01 17:31:12 UTC (rev 26353)
+++ csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch	2018-02-06 11:46:33 UTC (rev 26354)
@@ -1,39 +0,0 @@
-From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Tue, 29 Mar 2016 10:16:49 +0200
-Subject: [PATCH] chage_dh_param_to_2048
-
----
- configure.in | 2 +-
- src/nrpe.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f0dfa09..1993140 100644
---- a/configure.in
-+++ b/configure.in
-@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then
- 				sslbin=$ssldir/bin/openssl
- 			fi
- 			# awk to strip off meta data at bottom of dhparam output
--			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
-+			$sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
- 		fi
- 	fi
- 
-diff --git a/src/nrpe.c b/src/nrpe.c
-index 381f0ac..6234492 100644
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -266,7 +266,7 @@ int main(int argc, char **argv){
- 
- 		/* use anonymous DH ciphers */
- 		SSL_CTX_set_cipher_list(ctx,"ADH");
--		dh=get_dh512();
-+		dh=get_dh2048();
- 		SSL_CTX_set_tmp_dh(ctx,dh);
- 		DH_free(dh);
- 		if(debug==TRUE)
--- 
-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  Wed Feb  7 16:03:20 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 07 Feb 2018 15:03:20 +0000
Subject: SF.net SVN: gar:[26355] csw/mgar/pkg/t1lib/trunk/Makefile
Message-ID: <1518015800.745178.27132@sfp-scm-5.v30.ch3.sourceforge.com>

Revision: 26355
          http://sourceforge.net/p/gar/code/26355
Author:   dmichelsen
Date:     2018-02-07 15:03:20 +0000 (Wed, 07 Feb 2018)
Log Message:
-----------
t1lib/trunk: Enable 64 bit libraries and rework Makefile

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

Modified: csw/mgar/pkg/t1lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/t1lib/trunk/Makefile	2018-02-06 11:46:33 UTC (rev 26354)
+++ csw/mgar/pkg/t1lib/trunk/Makefile	2018-02-07 15:03:20 UTC (rev 26355)
@@ -1,11 +1,12 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
-#
+
+
 NAME = t1lib
 VERSION = 5.1.2
 GARTYPE = v2
+DESCRIPTION = Type1 font renderering library
 
-DESCRIPTION = Type1 font renderering library
 define BLURB
   t1lib is a library distributed under the GNU General Public Library
   License for generating character- and string-glyphs from Adobe Type 1
@@ -14,64 +15,51 @@
   rasterizer being included in X11 have been eliminated.
 endef
 
-MASTER_SITES = ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES = https://fossies.org/linux/misc/old/
+DISTFILES += $(DISTNAME).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS)
-GARCOMPILER			=	GNU
-# there is no check defined in upstream's Makefile:
-SKIPTEST			=	1
-LICENSE				=	LICENSE
+LICENSE = LICENSE
 
-PACKAGES					+=	CSWlibt1-5
-CATALOGNAME_CSWlibt1-5		=	libt1_5
-SPKG_DESC_CSWlibt1-5		+=	$(DESCRIPTION), libt1.so.5
-OBSOLETED_BY_CSWlibt1-5		=	CSWt1lib
-PKGFILES_CSWlibt1-5			=	$(call baseisadirs,$(libdir),libt1\.so\.5\.1\.2)
-PKGFILES_CSWlibt1-5			+=	$(call baseisadirs,$(libdir),libt1\.so\.5(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibt1-5	+=	CSWlibgcc-s1
+PACKAGES += CSWlibt1-5
+SPKG_DESC_CSWlibt1-5 += $(DESCRIPTION), libt1.so.5
+PKGFILES_CSWlibt1-5 += $(call pkgfiles_lib,libt1.so.5)
+RUNTIME_DEP_PKGS_CSWlibt1-5 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibt1-5 += CSWt1lib
 
-PACKAGES					+=	CSWlibt1x5
-CATALOGNAME_CSWlibt1x5		=	libt1x5
-SPKG_DESC_CSWlibt1x5		+=	$(DESCRIPTION), libt1x.so.5
-OBSOLETED_BY_CSWlibt1x5		=	CSWt1lib
-PKGFILES_CSWlibt1x5			+=	$(call baseisadirs,$(libdir),libt1x\.so\.5\.1\.2)
-PKGFILES_CSWlibt1x5			+=	$(call baseisadirs,$(libdir),libt1x\.so\.5(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibt1x5	+=	CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibt1x5	+=	CSWlibt1-5
-RUNTIME_DEP_PKGS_CSWlibt1x5	+=	CSWxpm
+PACKAGES += CSWlibt1x5
+SPKG_DESC_CSWlibt1x5 += $(DESCRIPTION), libt1x.so.5
+PKGFILES_CSWlibt1x5 += $(call pkgfiles_lib,libt1x.so.5)
+RUNTIME_DEP_PKGS_CSWlibt1x5 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibt1x5 += CSWlibt1-5
+OBSOLETED_BY_CSWlibt1x5 += CSWt1lib
 
-PACKAGES						+=	CSWt1lib-dev
-CATALOGNAME_CSWt1lib-dev		= t1lib_dev
-SPKG_DESC_CSWt1lib-dev			+= $(DESCRIPTION), development files
-OBSOLETED_BY_CSWt1lib-dev		=	CSWt1lib
-PKGFILES_CSWt1lib-dev 			=	/opt/csw/lib/libt1.so
-PKGFILES_CSWt1lib-dev			+=	/opt/csw/lib/libt1x.so
-PKGFILES_CSWt1lib-dev			+= $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWt1lib-dev	+=	CSWlibt1-5
-RUNTIME_DEP_PKGS_CSWt1lib-dev	+=	CSWlibt1x5
-# why is this? .so are just symbolic links:
-CHECKPKG_OVERRIDES_CSWt1lib-dev	+=	archall-devel-package
-ARCHALL_CSWt1lib-dev			=	1
+PACKAGES += CSWt1lib-dev
+SPKG_DESC_CSWt1lib-dev += $(DESCRIPTION), development files
+OBSOLETED_BY_CSWt1lib-dev = CSWt1lib
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWt1lib-dev += CSWlibt1-5
+RUNTIME_DEP_PKGS_CSWt1lib-dev += CSWlibt1x5
 
-PACKAGES							+=  CSWt1lib-utils
-CATALOGNAME_CSWt1lib-utils			=	t1lib_utils
-SPKG_DESC_CSWt1lib-utils			+=	$(DESCRIPTION), utilities
-OBSOLETED_BY_CSWt1lib-utils			=	CSWt1lib
-PKGFILES_CSWt1lib-utils				=	/opt/csw/bin/type1afm
-PKGFILES_CSWt1lib-utils				+=	/opt/csw/bin/xglyph
-PKGFILES_CSWt1lib-utils				+=	/opt/csw/share/t1lib/t1lib.config
-RUNTIME_DEP_PKGS_CSWt1lib-utils		+=	CSWlibt1x5
-RUNTIME_DEP_PKGS_CSWt1lib-utils		+=	CSWxpm
-# this is to keep the transitivity principle:
-CHECKPKG_OVERRIDES_CSWt1lib-utils	+=	missing-dependency|CSWlibt1-5
+PACKAGES +=  CSWt1lib-utils
+SPKG_DESC_CSWt1lib-utils += $(DESCRIPTION), utilities
+OBSOLETED_BY_CSWt1lib-utils = CSWt1lib
+PKGFILES_CSWt1lib-utils += $(bindir)/.*
+PKGFILES_CSWt1lib-utils += $(sharedstatedir)/t1lib/t1lib.config
+RUNTIME_DEP_PKGS_CSWt1lib-utils += CSWlibt1-5
+RUNTIME_DEP_PKGS_CSWt1lib-utils += CSWlibt1x5
 
-PACKAGES						+=	CSWt1lib-doc
-CATALOGNAME_CSWt1lib-doc		=	t1lib_doc
-SPKG_DESC_CSWt1lib-doc			+=	$(DESCRIPTION), documentation
-OBSOLETED_BY_CSWt1lib-doc		=	CSWt1lib
-CHECKPKG_OVERRIDES_CSWt1lib-doc	+=	file-with-bad-content|/usr/local|root/opt/csw/share/t1lib/doc/t1lib_doc.ps
-ARCHALL_CSWt1lib-doc			=	1
+PACKAGES += CSWt1lib-doc
+SPKG_DESC_CSWt1lib-doc += $(DESCRIPTION), documentation
+PKGFILES_CSWt1lib-doc += $(sharedstatedir)/t1lib/doc/.*
+CHECKPKG_OVERRIDES_CSWt1lib-doc += file-with-bad-content|/usr/local|root/opt/csw/share/t1lib/doc/t1lib_doc.ps
+ARCHALL_CSWt1lib-doc = 1
+OBSOLETED_BY_CSWt1lib-doc = CSWt1lib
 
+GARCOMPILER = GNU
+BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# There is no check defined
+TEST_SCRIPTS =
+
 include gar/category.mk
-

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


From dmichelsen at users.sourceforge.net  Wed Feb  7 16:07:07 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 07 Feb 2018 15:07:07 +0000
Subject: SF.net SVN: gar:[26356] csw/mgar/pkg/t1lib/trunk/Makefile
Message-ID: <1518016027.409296.5686@sfp-scm-6.v30.ch3.sourceforge.com>

Revision: 26356
          http://sourceforge.net/p/gar/code/26356
Author:   dmichelsen
Date:     2018-02-07 15:07:06 +0000 (Wed, 07 Feb 2018)
Log Message:
-----------
t1lib/trunk: Remove unused override

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

Modified: csw/mgar/pkg/t1lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/t1lib/trunk/Makefile	2018-02-07 15:03:20 UTC (rev 26355)
+++ csw/mgar/pkg/t1lib/trunk/Makefile	2018-02-07 15:07:06 UTC (rev 26356)
@@ -51,7 +51,6 @@
 PACKAGES += CSWt1lib-doc
 SPKG_DESC_CSWt1lib-doc += $(DESCRIPTION), documentation
 PKGFILES_CSWt1lib-doc += $(sharedstatedir)/t1lib/doc/.*
-CHECKPKG_OVERRIDES_CSWt1lib-doc += file-with-bad-content|/usr/local|root/opt/csw/share/t1lib/doc/t1lib_doc.ps
 ARCHALL_CSWt1lib-doc = 1
 OBSOLETED_BY_CSWt1lib-doc = CSWt1lib
 

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 Feb  8 08:48:14 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 08 Feb 2018 07:48:14 +0000
Subject: SF.net SVN: gar:[26357] csw/mgar/pkg/aspell/trunk/Makefile
Message-ID: <1518076095.7754.10522@sfp-scm-1.v30.ch3.sourceforge.com>

Revision: 26357
          http://sourceforge.net/p/gar/code/26357
Author:   dmichelsen
Date:     2018-02-08 07:48:14 +0000 (Thu, 08 Feb 2018)
Log Message:
-----------
aspell/trunk: Add 64 bit libraries

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

Modified: csw/mgar/pkg/aspell/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aspell/trunk/Makefile	2018-02-07 15:07:06 UTC (rev 26356)
+++ csw/mgar/pkg/aspell/trunk/Makefile	2018-02-08 07:48:14 UTC (rev 26357)
@@ -10,21 +10,23 @@
   The GNU spell checker (core package only, no dictionary)
 endef
 
-PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += changelog.CSW
 
-PACKAGES = CSWaspell 
+# We have to patch ltmain.sh script generated by libtool
+# to make sure the "-norunpath" option is passed to the linker
+PATCHFILES += 0001-norunpath-option.patch
 
+VENDOR_URL = http://aspell.net
+
+PACKAGES += CSWaspell 
 SPKG_DESC_CSWaspell = The GNU spell checker (binaries)
-RUNTIME_DEP_PKGS_CSWaspell  = CSWlibaspell15
-RUNTIME_DEP_PKGS_CSWaspell += CSWlibncursesw5 
-RUNTIME_DEP_PKGS_CSWaspell += CSWlibintl8
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWaspell += CSWlibaspell15
+RUNTIME_DEP_PKGS_CSWaspell += CSWlibncursesw6
+RUNTIME_DEP_PKGS_CSWaspell += CSWlibintl9
 
-CHECKPKG_OVERRIDES_CSWaspell += file-with-bad-content|/usr/local|root/opt/csw/share/info/aspell.info
-CHECKPKG_OVERRIDES_CSWaspell += file-with-bad-content|/usr/share|root/opt/csw/share/info/aspell.info
-CHECKPKG_OVERRIDES_CSWaspell += file-with-bad-content|/usr/local|root/opt/csw/share/doc/aspell/README
-
-
 PACKAGES += CSWlibaspell15
 SPKG_DESC_CSWlibaspell15 = The GNU spell checker (libraries)
 PKGFILES_CSWlibaspell15  = $(call pkgfiles_lib,libaspell.so.15)
@@ -31,37 +33,25 @@
 PKGFILES_CSWlibaspell15 += $(call pkgfiles_lib,libpspell.so.15)
 PKGFILES_CSWlibaspell15 += $(libdir)/aspell/.*
 PKGFILES_CSWlibaspell15 += $(docdir)/libaspell15/.* 
-RUNTIME_DEP_PKGS_CSWlibaspell15 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibaspell15 += CSWlibintl9
 
-CHECKPKG_OVERRIDES_CSWlibaspell15 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libaspell15/README
-
 # We want to keep pspell library in aspell package
 CHECKPKG_OVERRIDES_CSWlibaspell15 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libpspell.so.15.1.5|soname=libpspell.so.15|pkgname=CSWlibaspell15|expected=CSWlibpspell15
+CHECKPKG_OVERRIDES_CSWlibaspell15 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libpspell.so.15.1.5|soname=libpspell.so.15|pkgname=CSWlibaspell15|expected=CSWlibpspell15
+CHECKPKG_OVERRIDES_CSWlibaspell15 += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libpspell.so.15.1.5|soname=libpspell.so.15|pkgname=CSWlibaspell15|expected=CSWlibpspell15
 
 PACKAGES += CSWlibaspell-dev
-
 SPKG_DESC_CSWlibaspell-dev = The GNU spell checker (developpement files)
-PKGFILES_CSWlibaspell-dev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibaspell-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWlibaspell-dev += $(docdir)/libaspell_dev/.* 
 RUNTIME_DEP_PKGS_CSWlibaspell-dev = CSWlibaspell15
 
-CHECKPKG_OVERRIDES_CSWlibaspell-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libaspell_dev/README
+EXTRA_LINKER_FLAGS = -lm -norunpath
 
+BUILD64 = 1
 
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES  = $(DISTNAME).tar.gz
-DISTFILES += changelog.CSW
-
-# We have to patch ltmain.sh script generated by libtool
-# to make sure the "-norunpath" option is passed to the linker
-PATCHFILES = 0001-norunpath-option.patch
-
-DOCFILES = TODO ABOUT-NLS README
-
-EXTRA_LINKER_FLAGS = -lm -norunpath
-
 CONFIGURE_ARGS = $(DIRPATHS)
-# The dictionnaries should be in a version indenpendant path
+# The dictionaries should be in a version indenpendant path
 CONFIGURE_ARGS += --enable-pkglibdir=$(libdir)/aspell
 CONFIGURE_ARGS += --enable-pkgdatadir=$(libdir)/aspell
 
@@ -69,6 +59,7 @@
 
 post-merge: merge-doc 
 
+merge-doc: DOCFILES = TODO ABOUT-NLS README
 merge-doc:
 	for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \
                 ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \

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


From dmichelsen at users.sourceforge.net  Sun Feb 18 16:25:29 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 18 Feb 2018 15:25:29 +0000
Subject: SF.net SVN: gar:[26361] csw/mgar/pkg/less/trunk
Message-ID: <1518967529.93753.4909@sfp-scm-5.v30.lw.sourceforge.com>

Revision: 26361
          http://sourceforge.net/p/gar/code/26361
Author:   dmichelsen
Date:     2018-02-18 15:25:21 +0000 (Sun, 18 Feb 2018)
Log Message:
-----------
less/trunk: Update to 530

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

Modified: csw/mgar/pkg/less/trunk/Makefile
===================================================================
--- csw/mgar/pkg/less/trunk/Makefile	2018-02-16 09:37:45 UTC (rev 26360)
+++ csw/mgar/pkg/less/trunk/Makefile	2018-02-18 15:25:21 UTC (rev 26361)
@@ -1,5 +1,5 @@
 NAME = less
-VERSION = 487
+VERSION = 530
 GARTYPE = v2
 
 DESCRIPTION = Less is a free, open-source file pager

Modified: csw/mgar/pkg/less/trunk/checksums
===================================================================
--- csw/mgar/pkg/less/trunk/checksums	2018-02-16 09:37:45 UTC (rev 26360)
+++ csw/mgar/pkg/less/trunk/checksums	2018-02-18 15:25:21 UTC (rev 26361)
@@ -1 +1 @@
-dcc8bf183a83b362d37fe9ef8df1fb60  less-487.tar.gz
+6a39bccf420c946b0fd7ffc64961315b  less-530.tar.gz

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


From janholzh at users.sourceforge.net  Tue Feb 20 14:16:47 2018
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Tue, 20 Feb 2018 13:16:47 +0000
Subject: SF.net SVN: gar:[26363] csw/mgar/pkg/lftp/trunk
Message-ID: <1519132607.428139.40941@sfp-scm-7.v30.lw.sourceforge.com>

Revision: 26363
          http://sourceforge.net/p/gar/code/26363
Author:   janholzh
Date:     2018-02-20 13:16:46 +0000 (Tue, 20 Feb 2018)
Log Message:
-----------
lftp/trunk: update to 4.8.3

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

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2018-02-18 15:37:08 UTC (rev 26362)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2018-02-20 13:16:46 UTC (rev 26363)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = lftp
-VERSION = 4.7.3
+VERSION = 4.8.3
 GARTYPE = v2
 
 DESCRIPTION = A sophisticated command-line ftp/http client
@@ -23,16 +23,16 @@
 
 PACKAGES = CSWlftp
 
-BUILD_DEP_PKGS = CSWgcc5g++
+#BUILD_DEP_PKGS = CSWgcc5g++
 
 RUNTIME_DEP_PKGS = CSWlibexpat1
 RUNTIME_DEP_PKGS += CSWlibiconv2
 RUNTIME_DEP_PKGS += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS += CSWlibsocks
-RUNTIME_DEP_PKGS += CSWlibintl8
+RUNTIME_DEP_PKGS += CSWlibintl9
 RUNTIME_DEP_PKGS += CSWlibreadline6
 RUNTIME_DEP_PKGS += CSWlibz1
-RUNTIME_DEP_PKGS += CSWlibidn11
+RUNTIME_DEP_PKGS += CSWlibidn2-0
 # necessary when compiled with gcc
 RUNTIME_DEP_PKGS += CSWlibgcc-s1
 RUNTIME_DEP_PKGS += CSWlibstdc++6

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2018-02-18 15:37:08 UTC (rev 26362)
+++ csw/mgar/pkg/lftp/trunk/checksums	2018-02-20 13:16:46 UTC (rev 26363)
@@ -1 +1 @@
-8eb1fe5f113126b60f172643c7f6c2e6  lftp-4.7.3.tar.gz
+646a2bb1782bda200b086f44de29964a  lftp-4.8.3.tar.gz

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


From rmottola at users.sourceforge.net  Tue Feb 20 18:06:12 2018
From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net)
Date: Tue, 20 Feb 2018 17:06:12 +0000
Subject: SF.net SVN: gar:[26364] csw/mgar/pkg/libicu50/trunk/Makefile
Message-ID: <1519146372.588928.36958@sfp-scm-6.v30.lw.sourceforge.com>

Revision: 26364
          http://sourceforge.net/p/gar/code/26364
Author:   rmottola
Date:     2018-02-20 17:06:11 +0000 (Tue, 20 Feb 2018)
Log Message:
-----------
libicu50/trunk: enable solaris9 and add some hacks needed for that old thing

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

Modified: csw/mgar/pkg/libicu50/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu50/trunk/Makefile	2018-02-20 13:16:46 UTC (rev 26363)
+++ csw/mgar/pkg/libicu50/trunk/Makefile	2018-02-20 17:06:11 UTC (rev 26364)
@@ -75,6 +75,11 @@
 
 REINPLACE_USRLOCAL += config/icu-config-bottom
 
+
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
+
+
 # Using -I/opt/csw/include here puts it before the include of the newly built
 # software which breaks definitions, so make sure it is empty.
 CPPFLAGS = 
@@ -84,7 +89,18 @@
 # packages using the libs will bail out as they assume the libs are self-contained.
 LINKER_FLAGS = -lCrun -lCstd -norunpath
 
-BUILD64_LIBS_ONLY = 1
+#BUILD64_LIBS_ONLY = 1
+# Enable 64 bits, but not for Solaris 9 x86
+BUILD64_5.9_sparc  = 1
+BUILD64_5.10_sparc = 1
+BUILD64_5.9_i386   =
+BUILD64_5.10_i386  = 1
+BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
+
+# Wrong return code of test TestEnumSet on Solaris 9, skip testsuite for now
+SKIPTEST-5.9 = 1
+SKIPTEST ?= $(SKIPTEST-$(GAROSREL))
+
 NOISALIST = 1
 
 include gar/category.mk

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


From dmichelsen at users.sourceforge.net  Wed Feb 21 17:02:01 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 21 Feb 2018 16:02:01 +0000
Subject: SF.net SVN: gar:[26365] csw/mgar/pkg/zutils/trunk
Message-ID: <1519228921.755786.33988@sfp-scm-4.v30.lw.sourceforge.com>

Revision: 26365
          http://sourceforge.net/p/gar/code/26365
Author:   dmichelsen
Date:     2018-02-21 16:02:00 +0000 (Wed, 21 Feb 2018)
Log Message:
-----------
zutils/trunk: Update to 1.7

Modified Paths:
--------------
    csw/mgar/pkg/zutils/trunk/Makefile
    csw/mgar/pkg/zutils/trunk/checksums
    csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch

Added Paths:
-----------
    csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch

Removed Paths:
-------------
    csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,5 +1,5 @@
 NAME = zutils
-VERSION = 1.0
+VERSION = 1.7
 GARTYPE = v2
 
 DESCRIPTION = Utilities to deal with compressed and non-compressed files
@@ -13,19 +13,27 @@
 endef
 
 
-MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/
-DISTFILES = $(DISTNAME).tar.lz
+MASTER_SITES += http://download.savannah.gnu.org/releases/zutils/
+DISTFILES += $(DISTNAME).tar.lz
 PATCHFILES += 0001-Add-headers-for-kill-2.patch
-PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch
+PATCHFILES += 0002-Use-test-f-instead-of-e.patch
 
+VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
+
 BUILD_DEP_PKGS += CSWhelp2man
 BUILD_DEP_PKGS += CSWlzip
 
 # The lzip binary is used from the scripts which is not detected by checkpkg
-RUNTIME_DEP_PKGS = CSWlzip
+RUNTIME_DEP_PKGS_CSWzutils = CSWlzip
+RUNTIME_DEP_PKGS_CSWzutils = CSWdiffutils
+RUNTIME_DEP_PKGS_CSWzutils = CSWggrep
 CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWlzip
+CHECKPKG_OVERRIDES_CSWzutils += surplus-dependency|CSWggrep
 
-VENDOR_URL = http://www.nongnu.org/zutils/zutils.html
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = /bin/sh
+REINPLACE_WITH_bash = /bin/bash
+REINPLACE_FILES_bash += testsuite/check.sh
 
 EXTRA_LINKER_FLAGS = -norunpath
 
@@ -38,10 +46,15 @@
 CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ARGS += DIFF=/opt/csw/bin/gdiff
+CONFIGURE_ARGS += GREP=/opt/csw/bin/ggrep
 
 INSTALL_OVERRIDE_VARS = INSTALL
 INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
 
+EXTRA_INSTALL_EXPORTS += SHELL
+INSTALL_ENV_SHELL = /usr/bin/bash
+
 EXTRA_PAX_ARGS = -s ",/z,/Z,p"
 
 TEST_ENV_PATH = $(bindir):$(prefix)/gnu:$(PATH)
@@ -48,6 +61,6 @@
 
 include gar/category.mk
 
-post-extract-modulated:
+post-extract:
 	-gln -s zutils $(WORKSRC)/Zutils
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/zutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/zutils/trunk/checksums	2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/checksums	2018-02-21 16:02:00 UTC (rev 26365)
@@ -1 +1 @@
-26b85fac69e83454d00354635e3f787d  zutils-1.0.tar.lz
+7e80bbf1e9f578fa283cba0c9887a2d0  zutils-1.7.tar.lz

Modified: csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch	2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/files/0001-Add-headers-for-kill-2.patch	2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,53 +1,25 @@
-From 1bf577c42323a4d018f4d674b7617f6c09379498 Mon Sep 17 00:00:00 2001
+From 60a5c239a31b997ebce877b948bed98fe1a91d00 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 5 Jul 2013 13:13:37 +0200
+Date: Wed, 21 Feb 2018 16:18:20 +0100
 Subject: [PATCH] Add headers for kill(2)
 
 ---
- main.cc  | 2 ++
- zcmp.cc  | 2 ++
- zdiff.cc | 2 ++
- 3 files changed, 6 insertions(+)
+ zutils.cc | 2 ++
+ 1 file changed, 2 insertions(+)
 
-diff --git a/main.cc b/main.cc
-index f0a66e1..f98ac85 100644
---- a/main.cc
-+++ b/main.cc
-@@ -20,6 +20,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
+diff --git a/zutils.cc b/zutils.cc
+index 2b11532..3b9ca13 100644
+--- a/zutils.cc
++++ b/zutils.cc
+@@ -27,6 +27,8 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
 +#include <sys/types.h>
 +#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-diff --git a/zcmp.cc b/zcmp.cc
-index 0e5b781..52cbe6a 100644
---- a/zcmp.cc
-+++ b/zcmp.cc
-@@ -22,6 +22,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
-+#include <sys/types.h>
-+#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-diff --git a/zdiff.cc b/zdiff.cc
-index 14b679e..c5b3ff9 100644
---- a/zdiff.cc
-+++ b/zdiff.cc
-@@ -22,6 +22,8 @@
- #include <cerrno>
- #include <climits>
- #include <csignal>
-+#include <sys/types.h>
-+#include <signal.h>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
+ 
+ #include "rc.h"
+ #include "zutils.h"
 -- 
-1.8.3.1
+2.4.0
 

Added: csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch	                        (rev 0)
+++ csw/mgar/pkg/zutils/trunk/files/0002-Use-test-f-instead-of-e.patch	2018-02-21 16:02:00 UTC (rev 26365)
@@ -0,0 +1,25 @@
+From c45c292f7ebaa90ea4ab2ec9e7d4647909f08b1b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 21 Feb 2018 16:39:28 +0100
+Subject: [PATCH] Use test -f instead of -e
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 67b6998..6911492 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -134,7 +134,7 @@ install-bin : all
+ 	$(INSTALL_PROGRAM) ./zgrep "$(DESTDIR)$(bindir)/zgrep"
+ 	$(INSTALL_PROGRAM) ./ztest "$(DESTDIR)$(bindir)/ztest"
+ 	$(INSTALL_PROGRAM) ./zupdate "$(DESTDIR)$(bindir)/zupdate"
+-	if [ ! -e "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
++	if [ ! -f "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ] ; then \
+ 		if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi ; \
+ 		$(INSTALL_DATA) $(VPATH)/$(pkgname)rc "$(DESTDIR)$(sysconfdir)/$(pkgname)rc" ; \
+ 	fi
+-- 
+2.4.0
+

Deleted: csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch
===================================================================
--- csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch	2018-02-20 17:06:11 UTC (rev 26364)
+++ csw/mgar/pkg/zutils/trunk/files/0003-Use-Zutils-instead-of-zutils.patch	2018-02-21 16:02:00 UTC (rev 26365)
@@ -1,61 +0,0 @@
-From 6b133e98acfe1262b598878f1c3dc5e91c5ea587 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Nov 2010 14:09:29 +0100
-Subject: [PATCH 3/3] Use Zutils instead of zutils
-
----
- zcat.in   |    2 +-
- zegrep.in |    2 +-
- zfgrep.in |    2 +-
- zgrep.in  |    2 +-
- ztest.in  |    2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/zcat.in b/zcat.in
-index d88eef1..fb080d9 100644
---- a/zcat.in
-+++ b/zcat.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zcat "$@"
-+exec "${bindir}"Zutils --zcat "$@"
-diff --git a/zegrep.in b/zegrep.in
-index e01f655..d2dc371 100644
---- a/zegrep.in
-+++ b/zegrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep -E "$@"
-+exec "${bindir}"Zutils --zgrep -E "$@"
-diff --git a/zfgrep.in b/zfgrep.in
-index a3d54f3..74c6a95 100644
---- a/zfgrep.in
-+++ b/zfgrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep -F "$@"
-+exec "${bindir}"Zutils --zgrep -F "$@"
-diff --git a/zgrep.in b/zgrep.in
-index bfbc490..ba5a3de 100644
---- a/zgrep.in
-+++ b/zgrep.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --zgrep "$@"
-+exec "${bindir}"Zutils --zgrep "$@"
-diff --git a/ztest.in b/ztest.in
-index cc7dc9b..f973603 100644
---- a/ztest.in
-+++ b/ztest.in
-@@ -1,3 +1,3 @@
- #! /bin/sh
- bindir=`echo "$0" | sed -e 's,[^/]*$,,'`
--exec "${bindir}"zutils --ztest "$@"
-+exec "${bindir}"Zutils --ztest "$@"
--- 
-1.7.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 Feb 22 10:37:28 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 22 Feb 2018 09:37:28 +0000
Subject: SF.net SVN: gar:[26366] csw/mgar/pkg/readline/trunk/Makefile
Message-ID: <1519292248.60625.13057@sfp-scm-5.v30.lw.sourceforge.com>

Revision: 26366
          http://sourceforge.net/p/gar/code/26366
Author:   dmichelsen
Date:     2018-02-22 09:37:26 +0000 (Thu, 22 Feb 2018)
Log Message:
-----------
readline/trunk: Build on Solaris 10 only

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

Modified: csw/mgar/pkg/readline/trunk/Makefile
===================================================================
--- csw/mgar/pkg/readline/trunk/Makefile	2018-02-21 16:02:00 UTC (rev 26365)
+++ csw/mgar/pkg/readline/trunk/Makefile	2018-02-22 09:37:26 UTC (rev 26366)
@@ -16,9 +16,6 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 # PATCHFILES += patch-history.3.diff
 
-PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
 VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html
 
 # From pkg/readline52

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


From janholzh at users.sourceforge.net  Thu Feb 22 13:22:35 2018
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 22 Feb 2018 12:22:35 +0000
Subject: SF.net SVN: gar:[26367] csw/mgar/pkg/lftp/trunk
Message-ID: <1519302155.267428.7859@sfp-scm-5.v30.lw.sourceforge.com>

Revision: 26367
          http://sourceforge.net/p/gar/code/26367
Author:   janholzh
Date:     2018-02-22 12:22:25 +0000 (Thu, 22 Feb 2018)
Log Message:
-----------
lftp/trunk: fix build, remove dante socks because it's broken

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

Added Paths:
-----------
    csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch
    csw/mgar/pkg/lftp/trunk/files/fix-curses.patch
    csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch

Removed Paths:
-------------
    csw/mgar/pkg/lftp/trunk/files/munmap.patch

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2018-02-22 09:37:26 UTC (rev 26366)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2018-02-22 12:22:25 UTC (rev 26367)
@@ -28,9 +28,10 @@
 RUNTIME_DEP_PKGS = CSWlibexpat1
 RUNTIME_DEP_PKGS += CSWlibiconv2
 RUNTIME_DEP_PKGS += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS += CSWlibsocks
+#RUNTIME_DEP_PKGS += CSWlibsocks
 RUNTIME_DEP_PKGS += CSWlibintl9
-RUNTIME_DEP_PKGS += CSWlibreadline6
+RUNTIME_DEP_PKGS += CSWlibreadline7
+RUNTIME_DEP_PKGS += CSWlibncurses6
 RUNTIME_DEP_PKGS += CSWlibz1
 RUNTIME_DEP_PKGS += CSWlibidn2-0
 # necessary when compiled with gcc
@@ -46,11 +47,17 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += CSWlftp.cswreleasenotes
 
+
+PATCHDIRLEVEL = 0
 # do some type conversion before munmap call
 # so lftp can be compiled with sun cc 
 # (patch only mandatory to compile with gnutls)
-#PATCHFILES = munmap.patch
+PATCHFILES += lftp_ssl.patch
 
+# Fix to use only ncurses
+PATCHFILES += fix-curses.patch
+PATCHFILES += 0004-fix_ncuses_use.patch
+
 # Update the system-wide lftp.conf path in the man page
 PATCHFILES += 0007-update-configuration-files-paths-in-documentation.patch
 
@@ -75,7 +82,9 @@
 # instead of gnutls, no need to change that
 CONFIGURE_ARGS += --without-gnutls --with-openssl=$(prefix)
 # Requested see https://www.opencsw.org/mantis/view.php?id=4481
-CONFIGURE_ARGS += --with-socksdante
+# Broken on "modern" Solaris 10 and 11 disabled for now (socket error for ftp connection)
+#CONFIGURE_ARGS += --with-socksdante
+
 CONFIGURE_ARGS += --with-readline=$(prefix)
 CONFIGURE_ARGS += --with-expat=$(prefix)
 
@@ -86,7 +95,7 @@
 
 # gcc has some header fixes for curses.h which are included and brake everything.
 #add this so the ncuses curses.h is included
-EXTRA_CPPFLAGS = -I/opt/csw/include/ncurses
+#EXTRA_CPPFLAGS = -I/opt/csw/include/ncurses
 
 # No test suite here
 TEST_SCRIPTS =

Added: csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/0004-fix_ncuses_use.patch	2018-02-22 12:22:25 UTC (rev 26367)
@@ -0,0 +1,25 @@
+From 98b6737891500c11923a22019c94dd66439094d1 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Thu, 22 Feb 2018 11:36:36 +0100
+Subject: [PATCH] fix_ncuses_use
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 6350fcd..e9cd9cb 100755
+--- a/configure
++++ b/configure
+@@ -50253,7 +50253,7 @@ return tigetstr ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' tinfo curses ncurses; do
++for ac_lib in '' tinfo ncurses; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+-- 
+2.4.0
+

Added: csw/mgar/pkg/lftp/trunk/files/fix-curses.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/fix-curses.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/fix-curses.patch	2018-02-22 12:22:25 UTC (rev 26367)
@@ -0,0 +1,30 @@
+Force lftp to use just ncurses (rather than both Solaris curses and ncurses)
+because of the conflicting definition of setupterm:
+
+/usr/include/curses.h
+  extern int setupterm(char *, int, int *);
+
+/usr/include/ncurses/term.h
+  extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *);
+
+This appears to be a problem in the Solaris curses header file so not
+sending upstream.
+
+--- src/lftp_tinfo.cc.orig	2017-05-09 07:17:26.390916385 +0000
++++ src/lftp_tinfo.cc	2017-05-09 07:30:44.168086861 +0000
+@@ -20,14 +20,7 @@
+ #include <config.h>
+ 
+ extern "C" {
+-#if defined(HAVE_CURSES_H)
+-# include <curses.h>
+-# if defined(HAVE_TERM_H)
+-#  include <term.h>
+-# elif defined(HAVE_NCURSES_TERM_H)
+-#  include <ncurses/term.h>
+-# endif
+-#elif defined(HAVE_NCURSES_CURSES_H)
++#if defined(HAVE_NCURSES_CURSES_H)
+ # include <ncurses/curses.h>
+ # if defined(HAVE_NCURSES_TERM_H)
+ #  include <ncurses/term.h>

Added: csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch	                        (rev 0)
+++ csw/mgar/pkg/lftp/trunk/files/lftp_ssl.patch	2018-02-22 12:22:25 UTC (rev 26367)
@@ -0,0 +1,11 @@
+--- src/lftp_ssl.cc.old	Tue Mar  4 04:55:14 2008
++++ src/lftp_ssl.cc	Tue Mar  4 04:55:42 2008
+@@ -95,7 +95,7 @@
+ 
+ static void munmap_file(gnutls_datum_t data)
+ {
+-    munmap(data.data, data.size);
++    munmap((char*)data.data, data.size);
+ }
+ 
+ #if LFTP_LIBGNUTLS_VERSION_CODE < 0x010201

Deleted: csw/mgar/pkg/lftp/trunk/files/munmap.patch
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/munmap.patch	2018-02-22 09:37:26 UTC (rev 26366)
+++ csw/mgar/pkg/lftp/trunk/files/munmap.patch	2018-02-22 12:22:25 UTC (rev 26367)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru lftp-3.4.6.orig/src/lftp_ssl.cc lftp-3.4.6/src/lftp_ssl.cc
---- lftp-3.4.6.orig/src/lftp_ssl.cc	2006-04-27 18:08:49.188205000 -0400
-+++ lftp-3.4.6/src/lftp_ssl.cc	2006-04-27 18:08:41.398203000 -0400
-@@ -107,7 +107,7 @@
- 
- static void munmap_file(gnutls_datum_t data)
- {
--    munmap(data.data, data.size);
-+    munmap((caddr_t)data.data, data.size);
- }
- 
- #if LFTP_LIBGNUTLS_VERSION_CODE < 0x010201

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


From dmichelsen at users.sourceforge.net  Mon Feb 26 11:02:34 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Feb 2018 10:02:34 +0000
Subject: SF.net SVN: gar:[26368] csw/mgar/pkg/help2man/trunk
Message-ID: <1519639354.387165.278779@sfp-scm-6.v30.lw.sourceforge.com>

Revision: 26368
          http://sourceforge.net/p/gar/code/26368
Author:   dmichelsen
Date:     2018-02-26 10:02:31 +0000 (Mon, 26 Feb 2018)
Log Message:
-----------
help2man/trunk: Update to 1.47.5

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

Modified: csw/mgar/pkg/help2man/trunk/Makefile
===================================================================
--- csw/mgar/pkg/help2man/trunk/Makefile	2018-02-22 12:22:25 UTC (rev 26367)
+++ csw/mgar/pkg/help2man/trunk/Makefile	2018-02-26 10:02:31 UTC (rev 26368)
@@ -1,5 +1,5 @@
 NAME = help2man
-VERSION = 1.47.1
+VERSION = 1.47.5
 GARTYPE = v2
 
 DESCRIPTION = A tool for automatically generating simple manual pages from program output

Modified: csw/mgar/pkg/help2man/trunk/checksums
===================================================================
--- csw/mgar/pkg/help2man/trunk/checksums	2018-02-22 12:22:25 UTC (rev 26367)
+++ csw/mgar/pkg/help2man/trunk/checksums	2018-02-26 10:02:31 UTC (rev 26368)
@@ -1 +1 @@
-cf7aaaeea40bff1176df825430694173  help2man-1.47.1.tar.xz
+1c886063c9e0ab463906de804596aa2f  help2man-1.47.5.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 Feb 18 16:37:10 2018
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 18 Feb 2018 15:37:10 +0000
Subject: SF.net SVN: gar:[26362] csw/mgar/pkg/libffcall/trunk
Message-ID: <1518968230.863091.38565@sfp-scm-4.v30.lw.sourceforge.com>

Revision: 26362
          http://sourceforge.net/p/gar/code/26362
Author:   dmichelsen
Date:     2018-02-18 15:37:08 +0000 (Sun, 18 Feb 2018)
Log Message:
-----------
libffcall/trunk: Update to 2.1

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

Modified: csw/mgar/pkg/libffcall/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libffcall/trunk/Makefile	2018-02-18 15:25:21 UTC (rev 26361)
+++ csw/mgar/pkg/libffcall/trunk/Makefile	2018-02-18 15:37:08 UTC (rev 26362)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = libffcall
-VERSION = 2.0
+VERSION = 2.1
 GARTYPE = v2
 
 DESCRIPTION = Foreign function call libraries

Modified: csw/mgar/pkg/libffcall/trunk/checksums
===================================================================
--- csw/mgar/pkg/libffcall/trunk/checksums	2018-02-18 15:25:21 UTC (rev 26361)
+++ csw/mgar/pkg/libffcall/trunk/checksums	2018-02-18 15:37:08 UTC (rev 26362)
@@ -1 +1 @@
-e2e67382752287c5a7c42ac7ae79bfdc  libffcall-2.0.tar.gz
+0bc45ab055d40ba617f47e117084499f  libffcall-2.1.tar.gz

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


From janholzh at users.sourceforge.net  Wed Feb 28 11:12:57 2018
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Wed, 28 Feb 2018 10:12:57 +0000
Subject: SF.net SVN: gar:[26369] csw/mgar/pkg/openssl1/branches/lts102/Makefile
Message-ID: <1519812777.709402.1483723@sfp-scm-1.v30.lw.sourceforge.com>

Revision: 26369
          http://sourceforge.net/p/gar/code/26369
Author:   janholzh
Date:     2018-02-28 10:12:56 +0000 (Wed, 28 Feb 2018)
Log Message:
-----------
openssl1/branches/lts102: fix build, enable pkcs11-engine again

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

Modified: csw/mgar/pkg/openssl1/branches/lts102/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile	2018-02-26 10:02:31 UTC (rev 26368)
+++ csw/mgar/pkg/openssl1/branches/lts102/Makefile	2018-02-28 10:12:56 UTC (rev 26369)
@@ -154,14 +154,11 @@
 # Bug opened upstream: http://rt.openssl.org/Ticket/Display.html?id=3153
 PATCHFILES += make_issetugid_support_configurable.patch
 
-ifdef PKCS11
-        PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 ifneq ($(shell /usr/bin/uname -r),5.9)
 	PATCHFILES += openssl-1.0.2h-pkcs11-engine.patch
 	ENGINES += pk11
         CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so)
 endif
-endif
 
 
 
@@ -252,7 +249,7 @@
 LIBDIR_64 = --libdir=lib/64
 LIBDIR = $(LIBDIR_$(MEMORYMODEL))
 
-CONFIGURE_ARGS = --prefix=$(prefix)
+CONFIGURE_ARGS += --prefix=$(prefix)
 CONFIGURE_ARGS += --openssldir=$(sysconfdir)/ssl
 CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR)
 CONFIGURE_ARGS += $(CONFIGURE_FLAGS)

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


From janholzh at users.sourceforge.net  Wed Feb 28 13:15:37 2018
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Wed, 28 Feb 2018 12:15:37 +0000
Subject: SF.net SVN: gar:[26370] csw/mgar/pkg/ca_certificates/trunk/checksums
Message-ID: <1519820137.954768.2096818@sfp-scm-4.v30.lw.sourceforge.com>

Revision: 26370
          http://sourceforge.net/p/gar/code/26370
Author:   janholzh
Date:     2018-02-28 12:15:36 +0000 (Wed, 28 Feb 2018)
Log Message:
-----------
ca_certificates/trunk: update to 20180228

Modified Paths:
--------------
    csw/mgar/pkg/ca_certificates/trunk/checksums

Modified: csw/mgar/pkg/ca_certificates/trunk/checksums
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/checksums	2018-02-28 10:12:56 UTC (rev 26369)
+++ csw/mgar/pkg/ca_certificates/trunk/checksums	2018-02-28 12:15:36 UTC (rev 26370)
@@ -1 +1 @@
-a1a696fad50008cbe3276847493459de  certdata.txt
+0b67e7d80d0f93373bf86be9d5831b8a  certdata.txt

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