Skip to content

Commit

Permalink
Merge pull request #912 from babayoshihiko/cran-20220508
Browse files Browse the repository at this point in the history 
New upstream versions for CRAN with some fixes
  • Loading branch information
@nieder
nieder authored Jul 7, 2022
2 parents 3ceafd6 + 04274e9 commit 3878133
Show file tree
Hide file tree
Showing 29 changed files with 1,077 additions and 215 deletions.
105 changes: 105 additions & 0 deletions 10.9-libcxx/stable/main/finkinfo/libs/rmods/cran-checkmate-r-2.0.0.info
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
Info2: <<

Package: cran-checkmate-r%type_pkg[rversion]
Distribution: <<
(%type_pkg[rversion] = 31 ) 10.9,
(%type_pkg[rversion] = 31 ) 10.10,
(%type_pkg[rversion] = 31 ) 10.11,
(%type_pkg[rversion] = 31 ) 10.12,
(%type_pkg[rversion] = 32 ) 10.9,
(%type_pkg[rversion] = 32 ) 10.10,
(%type_pkg[rversion] = 32 ) 10.11,
(%type_pkg[rversion] = 32 ) 10.12,
(%type_pkg[rversion] = 33 ) 10.9,
(%type_pkg[rversion] = 33 ) 10.10,
(%type_pkg[rversion] = 33 ) 10.11,
(%type_pkg[rversion] = 33 ) 10.12,
(%type_pkg[rversion] = 33 ) 10.13,
(%type_pkg[rversion] = 33 ) 10.14,
(%type_pkg[rversion] = 33 ) 10.14.5,
(%type_pkg[rversion] = 34 ) 10.9,
(%type_pkg[rversion] = 34 ) 10.10,
(%type_pkg[rversion] = 34 ) 10.11,
(%type_pkg[rversion] = 34 ) 10.12,
(%type_pkg[rversion] = 34 ) 10.13,
(%type_pkg[rversion] = 34 ) 10.14,
(%type_pkg[rversion] = 34 ) 10.14.5,
(%type_pkg[rversion] = 35 ) 10.9,
(%type_pkg[rversion] = 35 ) 10.10,
(%type_pkg[rversion] = 35 ) 10.11,
(%type_pkg[rversion] = 35 ) 10.12,
(%type_pkg[rversion] = 35 ) 10.13,
(%type_pkg[rversion] = 35 ) 10.14,
(%type_pkg[rversion] = 35 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.9,
(%type_pkg[rversion] = 36 ) 10.10,
(%type_pkg[rversion] = 36 ) 10.11,
(%type_pkg[rversion] = 36 ) 10.12,
(%type_pkg[rversion] = 36 ) 10.13,
(%type_pkg[rversion] = 36 ) 10.14,
(%type_pkg[rversion] = 36 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.15
<<
Type: rversion (4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1)
Version: 2.0.0
Revision: 1
Description: Fast and Versatile Argument Checks
Homepage: https://cran.r-project.org/package=checkmate
License: BSD
Maintainer: None <[email protected]>
Source: mirror:custom:checkmate_%v.tar.gz
Source-MD5: bcb4f623a0a9c5b297fb818346cad9a4
SourceDirectory: checkmate
CustomMirror: <<
Primary: https://cran.r-project.org/src/contrib
Secondary: https://cran.r-project.org/src/contrib/00Archive/checkmate
<<
Depends: <<
r-base%type_pkg[rversion],
cran-backports-r%type_pkg[rversion] (>= 1.1.0-1),
libgettext8-shlibs
<<
BuildDepends: <<
fink (>= 0.27.2),
r-base%type_pkg[rversion]-dev,
libgettext8-dev
<<
CompileScript: <<
#!/bin/bash -ev
export TMPDIR=%b/tmp
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

pushd ..
$BIN_R --verbose CMD build --no-build-vignettes checkmate
<<
InstallScript: <<
#!/bin/sh -ev
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

mkdir -p %i/lib/R/%type_raw[rversion]/site-library
pushd %b/.. && $BIN_R --verbose CMD INSTALL --library=%i/lib/R/%type_raw[rversion]/site-library checkmate
if (( $(echo "%type_raw[rversion] > 3.3" |bc -l) )); then
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.so %i/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.so
else
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.dylib %i/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.dylib
fi
<<
SplitOff: <<
Package: %N-dev
Description: Headers for CRAN checkmate
BuildDependsOnly: true
Depends: %N (=%v-%r)
Replaces: %N (<= 1.8.3-2)
Files: lib/R/%type_raw[rversion]/site-library/checkmate/include
<<
Shlibs: <<
( %type_raw[rversion] >= 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.so 0.0.0 %n (>=1.8.3-1)
( %type_raw[rversion] << 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/checkmate/libs/checkmate.dylib 0.0.0 %n (>=1.8.3-1)
<<
DescDetail: <<
Tests and assertions to perform frequent argument checks.
A substantial part of the package was written in C to minimize
any worries about execution time overhead.
<<

<<
17 changes: 9 additions & 8 deletions 10.9-libcxx/stable/main/finkinfo/libs/rmods/cran-checkmate-r.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ Info2: <<

Package: cran-checkmate-r%type_pkg[rversion]
Distribution: <<
(%type_pkg[rversion] = 31 ) 10.9,
(%type_pkg[rversion] = 31 ) 10.10,
(%type_pkg[rversion] = 31 ) 10.11,
(%type_pkg[rversion] = 31 ) 10.12,
(%type_pkg[rversion] = 32 ) 10.9,
(%type_pkg[rversion] = 32 ) 10.10,
(%type_pkg[rversion] = 32 ) 10.11,
Expand Down Expand Up @@ -40,15 +36,15 @@ Distribution: <<
(%type_pkg[rversion] = 36 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.15
<<
Type: rversion (4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1)
Version: 2.0.0
Type: rversion (4.1 4.0 3.6 3.5 3.4 3.3 3.2)
Version: 2.1.0
Revision: 1
Description: Fast and Versatile Argument Checks
Homepage: https://cran.r-project.org/package=checkmate
License: BSD
Maintainer: None <[email protected]>
Source: mirror:custom:checkmate_%v.tar.gz
Source-MD5: bcb4f623a0a9c5b297fb818346cad9a4
Source-Checksum: SHA256(b784dd5163a0350d084ef34882d9781373839dedeaa9a8b8e6187d773d0d21c6)
SourceDirectory: checkmate
CustomMirror: <<
Primary: https://cran.r-project.org/src/contrib
Expand All @@ -66,7 +62,6 @@ BuildDepends: <<
<<
CompileScript: <<
#!/bin/bash -ev
export TMPDIR=%b/tmp
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

pushd ..
Expand Down Expand Up @@ -101,5 +96,11 @@ Tests and assertions to perform frequent argument checks.
A substantial part of the package was written in C to minimize
any worries about execution time overhead.
<<
DescPackaging: <<
Package version R version
2.1.0 >= 3.2
2.0.0 >= 3.1
error: use of undeclared identifier 'Chars' when building 2.1.0 for R-3.1
<<

<<
9 changes: 8 additions & 1 deletion 10.9-libcxx/stable/main/finkinfo/libs/rmods/cran-cli-r.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Distribution: <<
<<
Type: rversion (4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1)
Version: 3.1.0
Revision: 1
Revision: 2
Description: Helpers for Developing CLIs
Homepage: https://cran.r-project.org/package=cli
License: BSD
Expand Down Expand Up @@ -86,6 +86,13 @@ Shlibs: <<
( %type_raw[rversion] >= 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cli/libs/cli.so 0.0.0 %n (>=0.9-04-1)
( %type_raw[rversion] << 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cli/libs/cli.dylib 0.0.0 %n (>=0.9-04-1)
<<
SplitOff: <<
Package: %N-dev
Description: Headers for CRAN cli
BuildDependsOnly: true
Depends: %N (=%v-%r)
Files: lib/R/%type_raw[rversion]/site-library/cli/include
<<
DescDetail: <<
A suite of tools designed to build attractive command line interfaces ('CLIs').
Includes tools for drawing rules, boxes, trees, and 'Unicode' symbols with
Expand Down
83 changes: 83 additions & 0 deletions 10.9-libcxx/stable/main/finkinfo/libs/rmods/cran-cluster-r-2.1.2.info
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
Info2: <<

Package: cran-cluster-r%type_pkg[rversion]
Distribution: <<
(%type_pkg[rversion] = 34 ) 10.9,
(%type_pkg[rversion] = 34 ) 10.10,
(%type_pkg[rversion] = 34 ) 10.11,
(%type_pkg[rversion] = 34 ) 10.12,
(%type_pkg[rversion] = 34 ) 10.13,
(%type_pkg[rversion] = 34 ) 10.14,
(%type_pkg[rversion] = 34 ) 10.14.5,
(%type_pkg[rversion] = 35 ) 10.9,
(%type_pkg[rversion] = 35 ) 10.10,
(%type_pkg[rversion] = 35 ) 10.11,
(%type_pkg[rversion] = 35 ) 10.12,
(%type_pkg[rversion] = 35 ) 10.13,
(%type_pkg[rversion] = 35 ) 10.14,
(%type_pkg[rversion] = 35 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.9,
(%type_pkg[rversion] = 36 ) 10.10,
(%type_pkg[rversion] = 36 ) 10.11,
(%type_pkg[rversion] = 36 ) 10.12,
(%type_pkg[rversion] = 36 ) 10.13,
(%type_pkg[rversion] = 36 ) 10.14,
(%type_pkg[rversion] = 36 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.15
<<
Type: rversion (4.1 4.0 3.6 3.5 3.4)
Version: 2.1.2
Revision: 1
Description: Cluster Analysis Extended Rousseeuw et al
Homepage: https://cran.r-project.org/package=cluster
License: GPL
Maintainer: BABA Yoshihiko <[email protected]>
Source: mirror:custom:cluster_%v.tar.gz
Source-MD5: bcb680bff9f4364c09971bcc906ae645
SourceDirectory: cluster
CustomMirror: <<
Primary: https://cran.r-project.org/src/contrib
Secondary: https://cran.r-project.org/src/contrib/00Archive/cluster
<<
Depends: <<
r-base%type_pkg[rversion],
(%type_raw[rversion] << 3.6) gcc5-shlibs | (%type_raw[rversion] = 3.6) gcc9-shlibs | (%type_raw[rversion] >= 4.0) gcc11-shlibs,
libgettext8-shlibs
<<
BuildDepends: <<
fink (>= 0.27.2),
r-base%type_pkg[rversion]-dev,
(%type_raw[rversion] << 3.6) gcc5-compiler | (%type_raw[rversion] = 3.6) gcc9-compiler | (%type_raw[rversion] >= 4.0) gcc11-compiler,
libgettext8-dev
<<
CompileScript: <<
#!/bin/sh -ev
export TMPDIR=%b/tmp
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

pushd ..
$BIN_R --verbose CMD build --no-build-vignettes cluster
<<
InstallScript: <<
#!/bin/sh -ev
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

mkdir -p %i/lib/R/%type_raw[rversion]/site-library
pushd %b/.. && $BIN_R --verbose CMD INSTALL --library=%i/lib/R/%type_raw[rversion]/site-library cluster
if (( $(echo "%type_raw[rversion] > 3.3" |bc -l) )); then
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so %i/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so
else
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib %i/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib
fi
<<
Shlibs: <<
( %type_raw[rversion] >= 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so 0.0.0 %n (>=2.0.6-1)
( %type_raw[rversion] << 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib 0.0.0 %n (>=2.0.6-1)
<<
DescPackaging: <<
Package version R version
2.1.1 >= 3.4.0
2.1.0 >= 3.3.0
<<

<<
22 changes: 5 additions & 17 deletions 10.9-libcxx/stable/main/finkinfo/libs/rmods/cran-cluster-r.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ Info2: <<

Package: cran-cluster-r%type_pkg[rversion]
Distribution: <<
(%type_pkg[rversion] = 34 ) 10.9,
(%type_pkg[rversion] = 34 ) 10.10,
(%type_pkg[rversion] = 34 ) 10.11,
(%type_pkg[rversion] = 34 ) 10.12,
(%type_pkg[rversion] = 34 ) 10.13,
(%type_pkg[rversion] = 34 ) 10.14,
(%type_pkg[rversion] = 34 ) 10.14.5,
(%type_pkg[rversion] = 35 ) 10.9,
(%type_pkg[rversion] = 35 ) 10.10,
(%type_pkg[rversion] = 35 ) 10.11,
Expand All @@ -25,15 +18,15 @@ Distribution: <<
(%type_pkg[rversion] = 36 ) 10.14.5,
(%type_pkg[rversion] = 36 ) 10.15
<<
Type: rversion (4.1 4.0 3.6 3.5 3.4)
Version: 2.1.2
Type: rversion (4.1 4.0 3.6 3.5)
Version: 2.1.3
Revision: 1
Description: Cluster Analysis Extended Rousseeuw et al
Homepage: https://cran.r-project.org/package=cluster
License: GPL
Maintainer: BABA Yoshihiko <[email protected]>
Source: mirror:custom:cluster_%v.tar.gz
Source-MD5: bcb680bff9f4364c09971bcc906ae645
Source-Checksum: SHA256(a3ad7a9455d634c4e0c6ccf8ea7a3a392a0ecf9c2bdb368d127ffa68a93164a9)
SourceDirectory: cluster
CustomMirror: <<
Primary: https://cran.r-project.org/src/contrib
Expand All @@ -52,7 +45,6 @@ BuildDepends: <<
<<
CompileScript: <<
#!/bin/sh -ev
export TMPDIR=%b/tmp
BIN_R=%p/Library/Frameworks/R.framework/Versions/%type_raw[rversion]/Resources/bin/R

pushd ..
Expand All @@ -64,18 +56,14 @@ InstallScript: <<

mkdir -p %i/lib/R/%type_raw[rversion]/site-library
pushd %b/.. && $BIN_R --verbose CMD INSTALL --library=%i/lib/R/%type_raw[rversion]/site-library cluster
if (( $(echo "%type_raw[rversion] > 3.3" |bc -l) )); then
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so %i/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so
else
install_name_tool -id %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib %i/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib
fi
<<
Shlibs: <<
( %type_raw[rversion] >= 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so 0.0.0 %n (>=2.0.6-1)
( %type_raw[rversion] << 3.4 ) %p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.dylib 0.0.0 %n (>=2.0.6-1)
%p/lib/R/%type_raw[rversion]/site-library/cluster/libs/cluster.so 0.0.0 %n (>=2.0.6-1)
<<
DescPackaging: <<
Package version R version
2.1.3 >= 3.5.0
2.1.1 >= 3.4.0
2.1.0 >= 3.3.0
<<
Expand Down
Loading

0 comments on commit 3878133

Please sign in to comment.