From dmichelsen at users.sourceforge.net Sun Apr 5 17:52:17 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 05 Apr 2020 15:52:17 +0000 Subject: SF.net SVN: gar:[26627] csw/mgar/pkg/bison/trunk Message-ID: <1586101938.151958.20491@sfp-scm-4.v30.lw.sourceforge.com> Revision: 26627 http://sourceforge.net/p/gar/code/26627 Author: dmichelsen Date: 2020-04-05 15:52:17 +0000 (Sun, 05 Apr 2020) Log Message: ----------- bison/trunk: Update to 3.5.4 Modified Paths: -------------- csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/bison/trunk/checksums Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2020-03-30 10:34:46 UTC (rev 26626) +++ csw/mgar/pkg/bison/trunk/Makefile 2020-04-05 15:52:17 UTC (rev 26627) @@ -1,7 +1,7 @@ # $Id$ NAME = bison -VERSION = 3.5.1 +VERSION = 3.5.4 GARTYPE = v2 DESCRIPTION = GNU Project parser generator (yacc replacement) @@ -24,7 +24,7 @@ # Make sure to use a recent compiler, Sun Studio 12 produces compile time errors: # https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00045.html -GARCOMPILER = SOS12U5 +GARCOMPILER = SOS12U6 # We need 'seq' TEST_ENV_PATH = /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/bison/trunk/checksums =================================================================== --- csw/mgar/pkg/bison/trunk/checksums 2020-03-30 10:34:46 UTC (rev 26626) +++ csw/mgar/pkg/bison/trunk/checksums 2020-04-05 15:52:17 UTC (rev 26627) @@ -1 +1 @@ -6fc5fa4488832a65db934b9e93bd5d4c bison-3.5.1.tar.xz +eca85fc68de0aa77b26963b0a30d995a bison-3.5.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 23 13:13:00 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 23 Apr 2020 11:13:00 +0000 Subject: SF.net SVN: gar:[26628] csw/mgar/pkg/squid/branches/squid-4.x Message-ID: <1587640380.349057.31388@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26628 http://sourceforge.net/p/gar/code/26628 Author: dmichelsen Date: 2020-04-23 11:12:59 +0000 (Thu, 23 Apr 2020) Log Message: ----------- squid/branches/squid-4.x: Update to 4.11 Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid-4.x/Makefile csw/mgar/pkg/squid/branches/squid-4.x/checksums Modified: csw/mgar/pkg/squid/branches/squid-4.x/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2020-04-05 15:52:17 UTC (rev 26627) +++ csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2020-04-23 11:12:59 UTC (rev 26628) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 4.9 +VERSION = 4.11 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/branches/squid-4.x/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/checksums 2020-04-05 15:52:17 UTC (rev 26627) +++ csw/mgar/pkg/squid/branches/squid-4.x/checksums 2020-04-23 11:12:59 UTC (rev 26628) @@ -1 +1 @@ -5c2e335dd1e8ced9dda6e0e11894b344 squid-4.9.tar.xz +10f34e852153a9996aa4614670e2bda1 squid-4.11.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 Apr 26 17:34:14 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Apr 2020 15:34:14 +0000 Subject: SF.net SVN: gar:[26629] csw/mgar/pkg/pcre2/trunk Message-ID: <1587915254.362870.20305@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26629 http://sourceforge.net/p/gar/code/26629 Author: dmichelsen Date: 2020-04-26 15:34:13 +0000 (Sun, 26 Apr 2020) Log Message: ----------- pcre2/trunk: Update to 10.34 Modified Paths: -------------- csw/mgar/pkg/pcre2/trunk/Makefile csw/mgar/pkg/pcre2/trunk/checksums Modified: csw/mgar/pkg/pcre2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre2/trunk/Makefile 2020-04-23 11:12:59 UTC (rev 26628) +++ csw/mgar/pkg/pcre2/trunk/Makefile 2020-04-26 15:34:13 UTC (rev 26629) @@ -1,10 +1,10 @@ NAME = pcre2 -VERSION = 10.20 +VERSION = 10.34 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools -MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +MASTER_SITES += https://ftp.pcre.org/pub/pcre/ DISTFILES = $(DISTNAME).tar.bz2 #PATCHFILES = 0001-Allow-norunpath-for-libtool.patch @@ -12,13 +12,13 @@ PACKAGES = CSWpcre2 SPKG_DESC_CSWpcre2 = Perl-compatible regular expression tools v2 -RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibreadline7 RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibpcre2-8-0 RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibpcre2-16-0 RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibpcre2-32-0 RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibpcre2posix0 +RUNTIME_DEP_PKGS_CSWpcre2 += CSWlibpcre2posix2 PACKAGES += CSWlibpcre2-dev SPKG_DESC_CSWlibpcre2-dev = Development files for libpcre.so.1, libpcre16.so.0, libpcrecpp.so.0 and libpcreposix.so.0 @@ -25,7 +25,7 @@ RUNTIME_DEP_PKGS_CSWlibpcre2-dev += CSWlibpcre2-8-0 RUNTIME_DEP_PKGS_CSWlibpcre2-dev += CSWlibpcre2-16-0 RUNTIME_DEP_PKGS_CSWlibpcre2-dev += CSWlibpcre2-32-0 -RUNTIME_DEP_PKGS_CSWlibpcre2-dev += CSWlibpcre2posix0 +RUNTIME_DEP_PKGS_CSWlibpcre2-dev += CSWlibpcre2posix2 PKGFILES_CSWlibpcre2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibpcre2-dev += $(docdir)/.* @@ -44,10 +44,10 @@ SPKG_DESC_CSWlibpcre2-32-0 = Perl-compatible regular expression tools, libpcre2-32.so.0 PKGFILES_CSWlibpcre2-32-0 = $(call pkgfiles_lib,libpcre2-32.so.0) -PACKAGES += CSWlibpcre2posix0 -SPKG_DESC_CSWlibpcre2posix0 += Perl-compatible regular expression tools, libpcre2-posix.so.0 -PKGFILES_CSWlibpcre2posix0 += $(call pkgfiles_lib,libpcre2-posix.so.0) -RUNTIME_DEP_PKGS_CSWlibpcre2posix0 += CSWlibpcre2-8-0 +PACKAGES += CSWlibpcre2posix2 +SPKG_DESC_CSWlibpcre2posix2 += Perl-compatible regular expression tools, libpcre2-posix.so.2 +PKGFILES_CSWlibpcre2posix2 += $(call pkgfiles_lib,libpcre2-posix.so.2) +RUNTIME_DEP_PKGS_CSWlibpcre2posix2 += CSWlibpcre2-8-0 # Older compiler like Sun Studio 12 behave differently on -Wl,-i... and -Qoption ld -i... # This leads to configure detecting something works which later on does not work. Modified: csw/mgar/pkg/pcre2/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre2/trunk/checksums 2020-04-23 11:12:59 UTC (rev 26628) +++ csw/mgar/pkg/pcre2/trunk/checksums 2020-04-26 15:34:13 UTC (rev 26629) @@ -1 +1 @@ -dcd027c57ecfdc8a6c3af9d0acf5e3f7 pcre2-10.20.tar.bz2 +d280b62ded13f9ccf2fac16ee5286366 pcre2-10.34.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Apr 26 17:55:46 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 26 Apr 2020 15:55:46 +0000 Subject: SF.net SVN: gar:[26630] csw/mgar/pkg/pcre/trunk Message-ID: <1587916546.900104.16263@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26630 http://sourceforge.net/p/gar/code/26630 Author: dmichelsen Date: 2020-04-26 15:55:46 +0000 (Sun, 26 Apr 2020) Log Message: ----------- pcre/trunk: Update to 8.44 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2020-04-26 15:34:13 UTC (rev 26629) +++ csw/mgar/pkg/pcre/trunk/Makefile 2020-04-26 15:55:46 UTC (rev 26630) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.38 +VERSION = 8.44 GARTYPE = v2 DESCRIPTION = Perl-compatible regular expression tools @@ -10,7 +10,7 @@ wrapper functions that correspond to the POSIX regular expression API. endef -MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +MASTER_SITES += https://ftp.pcre.org/pub/pcre/ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch @@ -19,7 +19,7 @@ PACKAGES = CSWpcre CATALOGNAME_CSWpcre = pcre SPKG_DESC_CSWpcre = Perl-compatible regular expression tools -RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline7 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre16-0 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre32-0 Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2020-04-26 15:34:13 UTC (rev 26629) +++ csw/mgar/pkg/pcre/trunk/checksums 2020-04-26 15:55:46 UTC (rev 26630) @@ -1 +1 @@ -00aabbfe56d5a48b270f999b508c5ad2 pcre-8.38.tar.bz2 +cf7326204cc46c755b5b2608033d9d24 pcre-8.44.tar.bz2 Modified: csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch 2020-04-26 15:34:13 UTC (rev 26629) +++ csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch 2020-04-26 15:55:46 UTC (rev 26630) @@ -1,6 +1,6 @@ -From 3106a44b3a071761e592dd5803d99c197098a887 Mon Sep 17 00:00:00 2001 +From 072d250e0dc1f26026781cba55be40fa02fc981a Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Thu, 30 Apr 2015 11:19:42 +0200 +Date: Sun, 26 Apr 2020 17:32:34 +0200 Subject: [PATCH] Allow -norunpath for libtool --- @@ -8,18 +8,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ltmain.sh b/ltmain.sh -index 0f0a2da..97b6433 100644 +index d3ab94d..928ab56 100644 --- a/ltmain.sh +++ b/ltmain.sh -@@ -7275,7 +7275,7 @@ func_mode_link () - # -stdlib=* select c++ std lib with clang +@@ -7494,7 +7494,7 @@ func_mode_link () -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-norunpath) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*|-fsanitize=*|-fuse-ld=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*|-norunpath) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" -- -2.3.3 +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 Mon Apr 27 22:47:45 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 27 Apr 2020 20:47:45 +0000 Subject: SF.net SVN: gar:[26631] csw/mgar/pkg/r/trunk Message-ID: <1588020465.776535.10261@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26631 http://sourceforge.net/p/gar/code/26631 Author: dmichelsen Date: 2020-04-27 20:47:45 +0000 (Mon, 27 Apr 2020) Log Message: ----------- r/trunk: Update to 4.0.0 Modified Paths: -------------- csw/mgar/pkg/r/trunk/Makefile csw/mgar/pkg/r/trunk/checksums Added Paths: ----------- csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch Modified: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile 2020-04-26 15:55:46 UTC (rev 26630) +++ csw/mgar/pkg/r/trunk/Makefile 2020-04-27 20:47:45 UTC (rev 26631) @@ -2,22 +2,24 @@ # Only builds on Solaris 10 NAME = R -VERSION = 3.3.0 +VERSION = 4.0.0 GARTYPE = v2 DESCRIPTION = A language and environment for statistical computing and graphics MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-$(shell echo $(VERSION) | awk -F. '{print $$1}')/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWr-base VENDOR_URL = http://www.r-project.org/ +BUILD_DEP_PKGS += CSWadobereader + +PACKAGES += CSWr-base RUNTIME_DEP_PKGS_CSWr-base += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl9 RUNTIME_DEP_PKGS_CSWr-base += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWr-base += CSWliblzma5 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline7 RUNTIME_DEP_PKGS_CSWr-base += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWr-base += CSWlibz1 RUNTIME_DEP_PKGS_CSWr-base += CSWsunmath @@ -32,22 +34,41 @@ RUNTIME_DEP_PKGS_CSWr-base += CSWlibpangocairo1-0-0 RUNTIME_DEP_PKGS_CSWr-base += CSWlibgfortran3 RUNTIME_DEP_PKGS_CSWr-base += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpcre2-8-0 RUNTIME_DEP_PKGS_CSWr-base += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng16-16 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n56 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc56 -#Needed to install addons +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpsl5 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibssh2-1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibrtmp0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibidn2-0 +RUNTIME_DEP_PKGS_CSWr-base += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibnghttp2-14 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibbrotlidec1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibk5crypto3 + +# Needed to install addons RUNTIME_DEP_PKGS_CSWr-base += CSWgcc5g++ CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWgcc5g++ # These are because of linker anomaly -CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWr-base += surplus-dependency|CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWr-base-sparc += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWr-base-sparc += surplus-dependency|CSWlibglib2-0-0 +# This is x86 only +RUNTIME_DEP_PKGS_CSWr-base-i386 += CSWlibquadmath0 + +CHECKPKG_OVERRIDES_CSWr-base += $(CHECKPKG_OVERRIDES_CSWr-base-$(GARCH)) + # Temporary overrides CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content -CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry +#CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry # There is a special wrapper that takes care of finding the sonames. CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/R/bin/exec/R @@ -86,14 +107,31 @@ GARCOMPILER = GNU +# internet.so needs libnsl.so and libsocket.so which are linked against the "r" binary, but +# not internet.so. Skipping directly unneeded libraries leads to these errors: +# https://www.opencsw.org/mantis/view.php?id=5176 +# https://bugs.r-project.org/bugzilla/show_bug.cgi?id=15815 +LINKER_IGNORE = + BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +# We need 'grep -E' +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-internal-tzcode + TEST_TARGET = check-recommended +PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch + INTERNET_LIBS = -lsocket -lnsl +EXTRA_COMMON_EXPORTS += INTERNET_LIBS -EXTRA_COMMON_EXPORTS = INTERNET_LIBS +# This is buildfarm-specific and should probably be a global setting +http_proxy = http://proxy:3128 +https_proxy = http://proxy:3128 +EXTRA_COMMON_EXPORTS += http_proxy +EXTRA_COMMON_EXPORTS += https_proxy include gar/category.mk Modified: csw/mgar/pkg/r/trunk/checksums =================================================================== --- csw/mgar/pkg/r/trunk/checksums 2020-04-26 15:55:46 UTC (rev 26630) +++ csw/mgar/pkg/r/trunk/checksums 2020-04-27 20:47:45 UTC (rev 26631) @@ -1 +1 @@ -5a7506c8813432d1621c9725e86baf7a R-3.3.0.tar.gz +48c487c68112cb3191f3015c6277a50b R-4.0.0.tar.gz Added: csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch =================================================================== --- csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch (rev 0) +++ csw/mgar/pkg/r/trunk/files/0000-Solaris-does-not-have-a-good-utimensat.patch 2020-04-27 20:47:45 UTC (rev 26631) @@ -0,0 +1,27 @@ +From 7beb847809276ab94b62ed43c75a20f35b19ed6c Mon Sep 17 00:00:00 2001 +From: Gabor Csardi +Date: Fri, 24 Apr 2020 15:21:47 +0100 +Subject: [PATCH] Solaris does not have a good utimensat + +--- + src/main/platform.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/main/platform.c b/src/main/platform.c +index 726af2e..5d4bf1f 100644 +--- a/src/main/platform.c ++++ b/src/main/platform.c +@@ -2500,6 +2500,10 @@ SEXP attribute_hidden do_filecopy(SEXP call, SEXP op, SEXP args, SEXP rho) + # undef HAVE_UTIMENSAT + #endif + ++#if defined(__sun) ++# undef HAVE_UTIMENSAT ++#endif ++ + #if defined(HAVE_UTIMENSAT) + # include + # include +-- +2.3.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Apr 29 09:00:29 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Apr 2020 07:00:29 +0000 Subject: SF.net SVN: gar:[26632] csw/mgar/pkg/r/trunk/Makefile Message-ID: <1588143629.503147.6820@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26632 http://sourceforge.net/p/gar/code/26632 Author: dmichelsen Date: 2020-04-29 07:00:29 +0000 (Wed, 29 Apr 2020) Log Message: ----------- r/trunk: Fix dependency and some cleanup Modified Paths: -------------- csw/mgar/pkg/r/trunk/Makefile Modified: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile 2020-04-27 20:47:45 UTC (rev 26631) +++ csw/mgar/pkg/r/trunk/Makefile 2020-04-29 07:00:29 UTC (rev 26632) @@ -10,8 +10,10 @@ MASTER_SITES = http://stat.ethz.ch/CRAN/src/base/R-$(shell echo $(VERSION) | awk -F. '{print $$1}')/ DISTFILES += $(NAME)-$(VERSION).tar.gz -VENDOR_URL = http://www.r-project.org/ +PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch +VENDOR_URL = http://www.r-project.org/ + BUILD_DEP_PKGS += CSWadobereader PACKAGES += CSWr-base @@ -63,12 +65,10 @@ # This is x86 only RUNTIME_DEP_PKGS_CSWr-base-i386 += CSWlibquadmath0 +RUNTIME_DEP_PKGS_CSWr-base += $(RUNTIME_DEP_PKGS_CSWr-base-$(GARCH)) -CHECKPKG_OVERRIDES_CSWr-base += $(CHECKPKG_OVERRIDES_CSWr-base-$(GARCH)) - # Temporary overrides CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content -#CHECKPKG_OVERRIDES_CSWr-base += bad-rpath-entry # There is a special wrapper that takes care of finding the sonames. CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/R/bin/exec/R @@ -123,8 +123,6 @@ TEST_TARGET = check-recommended -PATCHFILES += 0000-Solaris-does-not-have-a-good-utimensat.patch - INTERNET_LIBS = -lsocket -lnsl EXTRA_COMMON_EXPORTS += INTERNET_LIBS 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 Apr 29 09:44:28 2020 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 29 Apr 2020 07:44:28 +0000 Subject: SF.net SVN: gar:[26633] csw/mgar/pkg/curl/trunk Message-ID: <1588146268.287854.30225@sfp-scm-1.v30.lw.sourceforge.com> Revision: 26633 http://sourceforge.net/p/gar/code/26633 Author: dmichelsen Date: 2020-04-29 07:44:27 +0000 (Wed, 29 Apr 2020) Log Message: ----------- curl/trunk: Update to 7.70.0 Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2020-04-29 07:00:29 UTC (rev 26632) +++ csw/mgar/pkg/curl/trunk/Makefile 2020-04-29 07:44:27 UTC (rev 26633) @@ -1,5 +1,5 @@ NAME = curl -VERSION = 7.69.1 +VERSION = 7.70.0 GARTYPE = v2 DESCRIPTION = Command line tool and library for client-side URL transfers Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2020-04-29 07:00:29 UTC (rev 26632) +++ csw/mgar/pkg/curl/trunk/checksums 2020-04-29 07:44:27 UTC (rev 26633) @@ -1 +1 @@ -eb77b3acf050df4afbc780367e0e7064 curl-7.69.1.tar.xz +62b15be1e75ddd31206aff34f7f7d77d curl-7.70.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.