February 2020 - crux-commits

ports/opt (3.5): libtasn1: 4.14 -> 4.16.0
by crux＠crux.nu 05 Feb '20

05 Feb '20

commit a4bb4bcef55e689e21fb092a5e6680115db4c557 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Feb 5 19:29:50 2020 +1100 libtasn1: 4.14 -> 4.16.0 diff --git a/libtasn1/.footprint b/libtasn1/.footprint index 0ad6b2f59..b8f9897d9 100644 --- a/libtasn1/.footprint +++ b/libtasn1/.footprint @@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtasn1.a -rwxr-xr-x root/root usr/lib/libtasn1.la -lrwxrwxrwx root/root usr/lib/libtasn1.so -> libtasn1.so.6.5.6 -lrwxrwxrwx root/root usr/lib/libtasn1.so.6 -> libtasn1.so.6.5.6 --rwxr-xr-x root/root usr/lib/libtasn1.so.6.5.6 +lrwxrwxrwx root/root usr/lib/libtasn1.so -> libtasn1.so.6.6.0 +lrwxrwxrwx root/root usr/lib/libtasn1.so.6 -> libtasn1.so.6.6.0 +-rwxr-xr-x root/root usr/lib/libtasn1.so.6.6.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtasn1.pc drwxr-xr-x root/root usr/share/ @@ -49,6 +49,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/asn1_get_tag_der.3.gz -rw-r--r-- root/root usr/share/man/man3/asn1_length_der.3.gz -rw-r--r-- root/root usr/share/man/man3/asn1_number_of_elements.3.gz +-rw-r--r-- root/root usr/share/man/man3/asn1_object_id_der.3.gz -rw-r--r-- root/root usr/share/man/man3/asn1_octet_der.3.gz -rw-r--r-- root/root usr/share/man/man3/asn1_parser2array.3.gz -rw-r--r-- root/root usr/share/man/man3/asn1_parser2tree.3.gz diff --git a/libtasn1/.signature b/libtasn1/.signature index caffc6b7e..8c924404c 100644 --- a/libtasn1/.signature +++ b/libtasn1/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cHrD7qNV4Lt646+8uulKUpRg0iFWg99IdZP85W+EKZ0+Eom2Dc03PG23pavuGR4l/bvG9pzGmnntfa3gh/uKgM= -SHA256 (Pkgfile) = a1d4f97d6f270c4e08d17750834afaeba7cd9b2a3f2fea46b0b08e4981ca7d95 -SHA256 (.footprint) = 3b39b6351b9a866a87db164831281fe676a8ae048837805515e44181f2958ea4 -SHA256 (libtasn1-4.14.tar.gz) = 9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08 +RWSE3ohX2g5d/es/Soj3rUisruAVixDFkKPd5ZWJcKC2HneFXKBFt57x/RezQPieJ58GpeZ1F1uKCPLHD/6eLxiCP5dBkpwA5gI= +SHA256 (Pkgfile) = 79a1fa3cc80410ae308b15cb10f05b243d91905dcfd55fc499e38ec30bfeb936 +SHA256 (.footprint) = 4c7f55795a671a41c468b2fb8eee933b435a00b7b9557a76abec6576fdabc74c +SHA256 (libtasn1-4.16.0.tar.gz) = 0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d diff --git a/libtasn1/Pkgfile b/libtasn1/Pkgfile index 29d255e5d..096d76c74 100644 --- a/libtasn1/Pkgfile +++ b/libtasn1/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Danny Rawlins, crux at romster dot me name=libtasn1 -version=4.14 +version=4.16.0 release=1 source=(https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)

1 0

ports/opt (3.5): qemu-agent: switch to python3
by crux＠crux.nu 05 Feb '20

05 Feb '20

commit bf59e2bc475ddf525ba07525cd50ccf9f5adeb43 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Feb 5 02:21:44 2020 +0100 qemu-agent: switch to python3 diff --git a/qemu-agent/.signature b/qemu-agent/.signature index 74faa33a2..53dfd86b1 100644 --- a/qemu-agent/.signature +++ b/qemu-agent/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cyb9py2Hmf50yF7OXmwEtW3/3xbEymCPq1iZgv8QeKQnnNYd01Kda6V+pd6PZDOeLZjw/vFuF1isKjL9CDW6Ao= -SHA256 (Pkgfile) = 74c9cfebb09b22b3c0d8d9f07bcf35cf9391bf5950ca1d924caeb65a85455e73 +RWSE3ohX2g5d/bDHmag0FlKqrXXb4CS9v/X/vObPuGeOiyynyk3coEfMEyKvwDGw1XkduhCNdVj1lYvc9GasHqbGaFOaeAJWZgk= +SHA256 (Pkgfile) = 6fbd9a96e444a97f6db3a6d1823718f8a0015936ecc9db24ffd26c128a373977 SHA256 (.footprint) = fe5d915c1696613ba69a424cbdd7bb13dc7a7caf7315357df4d9b509346b6bee SHA256 (qemu-4.2.0.tar.bz2) = 3cf4f3f73233a12211a045f07eef467fdc7bf3877568cd0c8a0cf36121da9fbd SHA256 (qemu-agent) = 0b1a5f7a115434d9692c0a8dd9f6c4eec7211efb5d0f9d837462dbe72e6e5c37 diff --git a/qemu-agent/Pkgfile b/qemu-agent/Pkgfile index 0cfc11106..b0d4e6b58 100644 --- a/qemu-agent/Pkgfile +++ b/qemu-agent/Pkgfile @@ -5,7 +5,7 @@ name=qemu-agent version=4.2.0 -release=1 +release=2 source=(http://wiki.qemu-project.org/download/qemu-$version.tar.bz2 qemu-agent) build() { @@ -17,6 +17,7 @@ build() { --disable-docs \ --libexecdir=/usr/lib/qemu \ --disable-gtk \ + --python=/usr/bin/python3 \ --target-list=x86_64-linux-user,i386-linux-user,i386-softmmu,x86_64-softmmu \ --enable-guest-agent

1 0

ports/opt (3.5): qemu: switch to python3
by crux＠crux.nu 05 Feb '20

05 Feb '20

commit 6ede76df0ec2f3512ab4a0c51ca9d9111514be73 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Feb 5 02:19:18 2020 +0100 qemu: switch to python3 diff --git a/qemu/.signature b/qemu/.signature index b9b1e6895..477780577 100644 --- a/qemu/.signature +++ b/qemu/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Vlx90sXltlS7NmT44cbxoVkUCKC56SbYLvCLrTOOozjM/CBSJbLHFfE4+vgdIoeoe36udnQE7F94+SaM7WmBwk= -SHA256 (Pkgfile) = acd163be9cd52c8ceb47de380098adc74a1e1a5caccf5da4384af6b601a9bd90 +RWSE3ohX2g5d/V1wWpFmBDiWeubIRD5gZcX4xwsMFsLwn8cQecCHGVRio6TncAndnKghW6le6BJlSLYsAx9CzjklrsxGjUEqsQg= +SHA256 (Pkgfile) = f2f43fa2e20e0f2b396aff633fac5a0639f30621dac0c927c98e79fbe481764c SHA256 (.footprint) = 2345b65afef6e00868a64051a34cd39fff673b1e265ca63df933b25cb9cd5edc SHA256 (qemu-4.2.0.tar.bz2) = 3cf4f3f73233a12211a045f07eef467fdc7bf3877568cd0c8a0cf36121da9fbd diff --git a/qemu/Pkgfile b/qemu/Pkgfile index 58621f843..d34066497 100644 --- a/qemu/Pkgfile +++ b/qemu/Pkgfile @@ -1,12 +1,12 @@ # Description: Fast CPU emulator and virtualizer for the x86 platform # URL: http://www.qemu-project.org/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: libsdl glib xorg-libpixman +# Depends on: libsdl glib xorg-libpixman python3 # Optional: libseccomp libiscsi libusb usbredir spice name=qemu version=4.2.0 -release=1 +release=2 source=(http://wiki.qemu-project.org/download/qemu-$version.tar.bz2) build() { @@ -21,6 +21,7 @@ build() { --libexecdir=/usr/lib/qemu \ --disable-gtk \ --localstatedir=/var \ + --python=/usr/bin/python3 \ --target-list=x86_64-linux-user,i386-linux-user,i386-softmmu,x86_64-softmmu # fix include issues with libcap

1 0

ports/contrib (3.5): jq: never use bundled oniguruma, fixes FS#1787
by crux＠crux.nu 05 Feb '20

05 Feb '20

commit b98657e0aa4cc80a1cfc3893e12205d1f95c8931 Author: Thomas Penteker <tek(a)serverop.de> Date: Wed Feb 5 02:03:10 2020 +0100 jq: never use bundled oniguruma, fixes FS#1787 diff --git a/jq/.footprint b/jq/.footprint index 63817e87d..a4a51971f 100644 --- a/jq/.footprint +++ b/jq/.footprint @@ -1,26 +1,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/jq --rwxr-xr-x root/root usr/bin/onig-config drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/jq.h -rw-r--r-- root/root usr/include/jv.h --rw-r--r-- root/root usr/include/oniggnu.h --rw-r--r-- root/root usr/include/onigposix.h --rw-r--r-- root/root usr/include/oniguruma.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libjq.a -rwxr-xr-x root/root usr/lib/libjq.la lrwxrwxrwx root/root usr/lib/libjq.so -> libjq.so.1.0.4 lrwxrwxrwx root/root usr/lib/libjq.so.1 -> libjq.so.1.0.4 -rwxr-xr-x root/root usr/lib/libjq.so.1.0.4 --rw-r--r-- root/root usr/lib/libonig.a --rwxr-xr-x root/root usr/lib/libonig.la -lrwxrwxrwx root/root usr/lib/libonig.so -> libonig.so.4.0.0 -lrwxrwxrwx root/root usr/lib/libonig.so.4 -> libonig.so.4.0.0 --rwxr-xr-x root/root usr/lib/libonig.so.4.0.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/oniguruma.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/jq/.signature b/jq/.signature index ea1973294..2cd83b6c7 100644 --- a/jq/.signature +++ b/jq/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31Qe6MAvLbd5V+neQCrUSaWH8bGHRyb9he74v64zEnuizRdg3Y9lT3xZpRDJ6gEoNzeoH4xmlOG+dM8kOV0edww= -SHA256 (Pkgfile) = 8c3c611f2e9f5bf31eb9842a64a9f4b90768e68dbf8c9af56cf2280cf5f009ad -SHA256 (.footprint) = 7a08ca1a12e1920ea0309620e381e7116fdc72e51b041c6c628a165a2b362668 +RWSagIOpLGJF33Hg7nk6sAgNQ0vlldRiuRkeDp4SAduQunYFQTLk5d7NbZ9TSreFKyrBVC3/fKB5xkHfE3NhkwfLsWDb2J2dlwU= +SHA256 (Pkgfile) = fa365e7339e17bf80ecd8e52bd66766708b2c46fc2d29bc292dc9a5315ad5a7a +SHA256 (.footprint) = ed1ce136382cf2464b74b5dfa2ebf6c840558f61fb589c8961a4ac16aa995465 SHA256 (jq-1.6.tar.gz) = 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 diff --git a/jq/Pkgfile b/jq/Pkgfile index f7d8dc979..3654e13e5 100644 --- a/jq/Pkgfile +++ b/jq/Pkgfile @@ -1,21 +1,22 @@ # Description: Lightweight and flexible command-line JSON processor # URL: https://stedolan.github.io/jq/ # Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: +# Optional: oniguruma name=jq version=1.6 -release=1 +release=2 source=(https://github.com/stedolan/jq/releases/download/jq-$version/jq-$ve… build() { cd $name-$version - autoreconf -i modules/oniguruma + # never use bundlded oniguruma for regex support + sed -i '242,245d;248,250d;256,267d' configure.ac + autoreconf -i ./configure --prefix=/usr \ - --disable-maintainer-mode \ - --with-oniguruma=builtin + --with-oniguruma=/usr make make DESTDIR=$PKG install

1 0

ports/opt (3.5): lftp: 4.9.0 -> 4.9.1
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit 5773da1115627776e2d23e971a06cdd583785b99 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue Feb 4 23:16:48 2020 +0100 lftp: 4.9.0 -> 4.9.1 diff --git a/lftp/.signature b/lftp/.signature index 4f9737afc..3f104c6d1 100644 --- a/lftp/.signature +++ b/lftp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RJJVsu0oICRsIcpt8ToJ9sx/+eR7Sf1Z3R+uuPF++uiA7lWc62VSvdP5uXohQAEeAZoYVK2BvUHKWgjmYEJfAw= -SHA256 (Pkgfile) = ae551a54dd1a751f7bb17a17b669c89204f23ec4098fd65e6fc65ec2748e844c +RWSE3ohX2g5d/YuSn4Ad8+7Y6Dhx2JNmLQM3Ez4afTEv0aKcRiLGOAYPvyf445NG3fnuwUsyMpitW9fmXi/ZS719E5Gb2I59zQU= +SHA256 (Pkgfile) = d9ce5887baae6e283ee29529c5bdb212500688c707e328e29abde2fe95ddd9c0 SHA256 (.footprint) = ba5036eea7685f8b219cd7ad0ff3184aac77106c65d7c43338be5b991c75dbb6 -SHA256 (lftp-4.9.0.tar.xz) = 0b3b659e1969a31827a25861c01ccf71ac6d3f20ee256bdf6999d653e031a24e +SHA256 (lftp-4.9.1.tar.xz) = 5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b diff --git a/lftp/Pkgfile b/lftp/Pkgfile index 3ba593ccf..6fa982b6a 100644 --- a/lftp/Pkgfile +++ b/lftp/Pkgfile @@ -5,7 +5,7 @@ # Depends on: openssl name=lftp -version=4.9.0 +version=4.9.1 release=1 source=(http://lftp.yar.ru/ftp/lftp-$version.tar.xz)

1 0

ports/contrib (3.5): docker: updated to version 19.03.5
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit 652121fff43a00a2f62a60d49dd7cdc3d3ce1faf Author: Matt Housh <jaeger(a)crux.ninja> Date: Tue Feb 4 14:35:23 2020 -0600 docker: updated to version 19.03.5 diff --git a/docker/.signature b/docker/.signature index b74788589..bf63e5b79 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF393ceiaOdPVnp3EpwWQ71TYs4x8sif9UFKBBDvf0QQbgtrn/u18sSfUVgO+c1IfUE9jKTCbsoOzJBIKMROiaLgI= -SHA256 (Pkgfile) = f96308fcbae6abe7a7f6a40ec13ac75a314a89a5ab8b63db254693583e7fcdcf +RWSagIOpLGJF39hySYwfyz6HXZPkrH+pny4npi/2Fc9DHvnG55E0gqysTnMkbbhryyvlv/Dq6KUn0gp+03Dom7ueAREnlk7ejQA= +SHA256 (Pkgfile) = 720d10615c9ed789d4b43c20bb643cc0d9ff2a19f2898ad7d97a38d9c8eeda98 SHA256 (.footprint) = bb919844c882663bd9d47875128ebc9d9e52ca3b569ea271d4b990fff980820a -SHA256 (docker-ce-v19.03.3.tar.gz) = 63b0d28608f32573b9c03fa46247c6f959e9c08133ddf30a71276919de0194c0 -SHA256 (docker-man-pages-19.03.3.tar.xz) = 5ade3aefca5eb9b4fffe297fc39f9f215f804680dc8658ba4a7481660328ffc8 -SHA256 (libnetwork-45c7102.tar.xz) = e18e20aa0208da338c57fbf43fb1db60e1d558408e7b2a540acbbd6c87c4f736 +SHA256 (docker-ce-v19.03.5.tar.gz) = d7948256e32bb4c104285d78e652ba9ead898c2e4dcee05f05ede2eaba719919 +SHA256 (docker-man-pages-19.03.5.tar.xz) = e911737231972e9fc89a525047c6a687a93039ffb12b26f5503ec792bfce806f +SHA256 (libnetwork-3eb3938.tar.xz) = c3a08f1e9142a999fd9febd8bdad0db5870df02b74969e60fdfdb6f45c27f8c5 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index 2e0bf145f..728789329 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -4,16 +4,16 @@ # Depends on: containerd runc btrfs-progs cgroupfs-mount name=docker -version=19.03.3 +version=19.03.5 release=1 source=(https://github.com/docker/docker-ce/archive/v$version/$name-ce-v$ve… \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ - http://jaeger.morpheus.net/linux/crux/files/libnetwork-45c7102.tar.xz \ + http://jaeger.morpheus.net/linux/crux/files/libnetwork-3eb3938.tar.xz \ $name.rc $name.conf) build() { export GOPATH=$SRC - export DOCKER_GITCOMMIT=74b1e89 + export DOCKER_GITCOMMIT=633a0ea export DOCKER_BUILDTAGS='seccomp' export DISABLE_WARN_OUTSIDE_CONTAINER=1 @@ -40,7 +40,7 @@ build() { (cd ..; \ GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ - libnetwork-45c7102/cmd/proxy) + libnetwork-3eb3938/cmd/proxy) for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M}

1 0

ports/contrib (3.5): python3-ruamel-yaml: 0.16.5 -> 0.16.7
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit 712934bcb2a37af4bbe8a64f77e374f821af4c26 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Feb 3 21:14:03 2020 +0100 python3-ruamel-yaml: 0.16.5 -> 0.16.7 diff --git a/python3-ruamel-yaml/.footprint b/python3-ruamel-yaml/.footprint index de3e0fec7..0a56b8332 100644 --- a/python3-ruamel-yaml/.footprint +++ b/python3-ruamel-yaml/.footprint @@ -2,45 +2,73 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.7/ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ --rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7-nspkg.pth -drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/ --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/PKG-INFO --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/SOURCES.txt --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/dependency_links.txt --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/namespace_packages.txt --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/requires.txt --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.5-py3.7.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7-nspkg.pth +drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/ +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/namespace_packages.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel.yaml-0.16.7-py3.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel/ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel/yaml/ -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__init__.py drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/ +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/__init__.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/__init__.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/anchor.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/anchor.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/comments.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/comments.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/compat.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/compat.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/composer.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/composer.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/configobjwalker.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/configobjwalker.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/constructor.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/constructor.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/cyaml.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/cyaml.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/dumper.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/dumper.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/emitter.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/emitter.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/error.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/error.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/events.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/events.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/loader.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/loader.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/main.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/main.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/nodes.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/nodes.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/parser.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/parser.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/reader.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/reader.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/representer.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/representer.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/resolver.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/resolver.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarbool.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarbool.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarfloat.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarfloat.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarint.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarint.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarstring.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scalarstring.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scanner.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/scanner.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/serializer.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/serializer.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/timestamp.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/timestamp.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/tokens.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/tokens.cpython-37.pyc +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/util.cpython-37.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/util.cpython-37.pyc -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/anchor.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/comments.py @@ -57,7 +85,7 @@ drwxr-xr-x root/root usr/lib/python3.7/site-packages/ruamel/yaml/__pycache__/ -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/main.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/nodes.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/parser.py --rw-rw-r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/py.typed (EMPTY) +-rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/py.typed (EMPTY) -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/reader.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/representer.py -rw-r--r-- root/root usr/lib/python3.7/site-packages/ruamel/yaml/resolver.py diff --git a/python3-ruamel-yaml/.signature b/python3-ruamel-yaml/.signature index a5d11bd3a..7b879085c 100644 --- a/python3-ruamel-yaml/.signature +++ b/python3-ruamel-yaml/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yxktTwaifBqFk8SNYsJe9ta4sBr7ARaVWVn62fDs1dl4tV0M5ducic6UF1Wgf9c+Mh9Ik3moipSOYNcLBns6go= -SHA256 (Pkgfile) = 271a4bc78dead0d8db079729565440f39b521303f1e87703c6a648bd5791ab08 -SHA256 (.footprint) = 42e5913d72ad19964e4095c2c686bcf96119a470b20749e56a8b99b19e1834b5 -SHA256 (ruamel.yaml-0.16.5.tar.gz) = 412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408 +RWSagIOpLGJF3/gWBVwFhPESnE+TF4BHIlrjsbyLEKCkwMBtXwJSPLzpzEGh/w1TXLMuMogDS8ifPMCMCR70c/+zoTiE74mxCgo= +SHA256 (Pkgfile) = dbf4654cc440c14ff16ff93f1695b8ea304f4dba4f047787ec8ac2fefbdff227 +SHA256 (.footprint) = ce53e183d398f5d3093d7876624b268aebe04fe08047529979558e14fc87493c +SHA256 (ruamel.yaml-0.16.7.tar.gz) = 9d59fa89985c55155d35c886663e357813404ae8f94638cb673135b8c8c1a7c7 diff --git a/python3-ruamel-yaml/Pkgfile b/python3-ruamel-yaml/Pkgfile index 5c2597155..4e11be848 100644 --- a/python3-ruamel-yaml/Pkgfile +++ b/python3-ruamel-yaml/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-ruamel-yaml -version=0.16.5 +version=0.16.7 release=1 source=(https://files.pythonhosted.org/packages/source/r/ruamel.yaml/ruamel…

1 0

ports/contrib (3.5): libcdr: 0.1.5 -> 0.1.6
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit f20bf7cc311dfdcae9ddf02e84ee00d668d75155 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Feb 3 17:28:29 2020 +0100 libcdr: 0.1.5 -> 0.1.6 diff --git a/libcdr/.footprint b/libcdr/.footprint index a07e2671f..b28911df4 100644 --- a/libcdr/.footprint +++ b/libcdr/.footprint @@ -15,8 +15,8 @@ drwxr-xr-x root/root usr/include/libcdr-0.1/libcdr/ -rw-r--r-- root/root usr/include/libcdr-0.1/libcdr/libcdr_api.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libcdr-0.1.la -lrwxrwxrwx root/root usr/lib/libcdr-0.1.so -> libcdr-0.1.so.1.0.5 -lrwxrwxrwx root/root usr/lib/libcdr-0.1.so.1 -> libcdr-0.1.so.1.0.5 --rwxr-xr-x root/root usr/lib/libcdr-0.1.so.1.0.5 +lrwxrwxrwx root/root usr/lib/libcdr-0.1.so -> libcdr-0.1.so.1.0.6 +lrwxrwxrwx root/root usr/lib/libcdr-0.1.so.1 -> libcdr-0.1.so.1.0.6 +-rwxr-xr-x root/root usr/lib/libcdr-0.1.so.1.0.6 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcdr-0.1.pc diff --git a/libcdr/.signature b/libcdr/.signature index aa548b56c..2379efe78 100644 --- a/libcdr/.signature +++ b/libcdr/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yAgIdDxHPKTeDl3LfpbevOg3SQrL0vl4okSFq411bEvbYDWggBtJf9xjzDn9XW1TgttHzTGVLkb36QmAM/BMgo= -SHA256 (Pkgfile) = 03cc347ead18658d8bd196b244b4cf04decc806ea1874bd2ba9a04f69035bb65 -SHA256 (.footprint) = cbb684541f6bc60a94475564810159beb1217ba8a454e6c590dfa6ae13ce4994 -SHA256 (libcdr-0.1.5.tar.xz) = 6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48 +RWSagIOpLGJF3y/jfCvb4qEHhz3FC7gzxage6i26NsaEiZIzb3RkZxfHtAwauQSbjBE6WnttEN7f1Kz/TWvYrf5VtGDCmW3EFwY= +SHA256 (Pkgfile) = 47813fcb1dbfb2f061626c7f2b9cbcee8c19c14df3bdaaadcf4445ed59afad95 +SHA256 (.footprint) = 7e43c2b2d7455d5fb28c7d445017ec62cfb52d7249f302898490c6679c6ebb21 +SHA256 (libcdr-0.1.6.tar.xz) = 01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861 diff --git a/libcdr/Pkgfile b/libcdr/Pkgfile index 55f127650..fc78cea2b 100644 --- a/libcdr/Pkgfile +++ b/libcdr/Pkgfile @@ -4,8 +4,8 @@ # Depends on: lcms2 librevenge icu name=libcdr -version=0.1.5 -release=2 +version=0.1.6 +release=1 source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz) build() {

1 0

ports/contrib (3.5): openblas: provide pkgconf files and fix linking for blas/cblas
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit 8e92223551c5a41e6dbec62598a5e53aad4aa93e Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Feb 4 16:01:47 2020 +0000 openblas: provide pkgconf files and fix linking for blas/cblas diff --git a/openblas/.footprint b/openblas/.footprint index 9fe9058c3..d651c8f50 100644 --- a/openblas/.footprint +++ b/openblas/.footprint @@ -9,16 +9,18 @@ drwxr-xr-x root/root usr/lib/cmake/ drwxr-xr-x root/root usr/lib/cmake/openblas/ -rw-r--r-- root/root usr/lib/cmake/openblas/OpenBLASConfig.cmake -rw-r--r-- root/root usr/lib/cmake/openblas/OpenBLASConfigVersion.cmake -lrwxrwxrwx root/root usr/lib/libblas.so -> libopenblas.so -lrwxrwxrwx root/root usr/lib/libblas.so.3 -> libopenblas.so -lrwxrwxrwx root/root usr/lib/libblas.so.3.8.0 -> libopenblas.so -lrwxrwxrwx root/root usr/lib/libcblas.so -> libopenblas.so -lrwxrwxrwx root/root usr/lib/libcblas.so.3 -> libopenblas.so -lrwxrwxrwx root/root usr/lib/libcblas.so.3.8.0 -> libopenblas.so +lrwxrwxrwx root/root usr/lib/libblas.so -> libopenblasp-r0.3.7.so +lrwxrwxrwx root/root usr/lib/libblas.so.3 -> libopenblasp-r0.3.7.so +lrwxrwxrwx root/root usr/lib/libblas.so.3.8.0 -> libopenblasp-r0.3.7.so +lrwxrwxrwx root/root usr/lib/libcblas.so -> libopenblasp-r0.3.7.so +lrwxrwxrwx root/root usr/lib/libcblas.so.3 -> libopenblasp-r0.3.7.so +lrwxrwxrwx root/root usr/lib/libcblas.so.3.8.0 -> libopenblasp-r0.3.7.so lrwxrwxrwx root/root usr/lib/libopenblas.a -> libopenblasp-r0.3.7.a lrwxrwxrwx root/root usr/lib/libopenblas.so -> libopenblasp-r0.3.7.so lrwxrwxrwx root/root usr/lib/libopenblas.so.0 -> libopenblasp-r0.3.7.so -rw-r--r-- root/root usr/lib/libopenblasp-r0.3.7.a -rwxr-xr-x root/root usr/lib/libopenblasp-r0.3.7.so drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/blas.pc -> openblas.pc +lrwxrwxrwx root/root usr/lib/pkgconfig/cblas.pc -> openblas.pc -rw-r--r-- root/root usr/lib/pkgconfig/openblas.pc diff --git a/openblas/.signature b/openblas/.signature index 6c3c49127..4b566d90d 100644 --- a/openblas/.signature +++ b/openblas/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+iWOrFA8nO2VVXQHhK7qvfrnMfUqeHR0ehDji5B8gysT0gy+45J6bwhc9K2eFUEHY4VF7zLLEHaYYbRnptRgQI= -SHA256 (Pkgfile) = 8a187a568c2edc97bead0276fa7dae04d2d7680ccbddff77bc710434fba80257 -SHA256 (.footprint) = ee391397503511f314ac19de9c8c7c9146d14d86b776c1fa22ed62259f992f3e +RWSagIOpLGJF39xpjTrL4Coxt9RQUUxFAF269BT8k5kEz0UfFSNTylAhugwTgHcNCV3+a/fXjuoIFYRsmZDY64PCQsmOiijmRwU= +SHA256 (Pkgfile) = 96514d2bc9381055646a93f8599b2ecd2a2f1ae0d6c3d7dfa7f633b439f17899 +SHA256 (.footprint) = 4fecafc316317ba8f5c39e374a40dbc76375cab680c05c04a36f4890e96f4438 SHA256 (OpenBLAS-0.3.7.tar.gz) = bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379 diff --git a/openblas/Pkgfile b/openblas/Pkgfile index 97d6679da..bb6da2810 100644 --- a/openblas/Pkgfile +++ b/openblas/Pkgfile @@ -6,13 +6,13 @@ name=openblas version=0.3.7 -release=2 +release=3 source=(https://github.com/xianyi/OpenBLAS/archive/v$version/OpenBLAS-$vers… build () { cd OpenBLAS-$version - make NO_LAPACK=1 NO_LAPACKE=1 NO_STATIC=1 \ - USE_OPENMP=1 DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 NUM_THREADS=64 \ + make NO_LAPACK=1 NO_LAPACKE=1 NO_STATIC=1 NO_AFFINITY=1 \ + USE_OPENMP=1 DYNAMIC_ARCH=1 NUM_THREADS=64 MAJOR_VERSION=3 \ CFLAGS="$CFLAGS $CPPFLAGS" libs netlib shared make PREFIX=$PKG/usr install @@ -20,20 +20,19 @@ build () { cd $PKG/usr/lib/ local _lapackver='3.8.0' # BLAS - ln -sf libopenblas.so libblas.so - ln -sf libopenblas.so libblas.so.${_lapackver:0:1} - ln -sf libopenblas.so libblas.so.${_lapackver} + ln -sf libopenblasp-r$version.so libblas.so + ln -sf libopenblasp-r$version.so libblas.so.${_lapackver:0:1} + ln -sf libopenblasp-r$version.so libblas.so.${_lapackver} # CBLAS - ln -sf libopenblas.so libcblas.so - ln -sf libopenblas.so libcblas.so.${_lapackver:0:1} - ln -sf libopenblas.so libcblas.so.${_lapackver} + ln -sf libopenblasp-r$version.so libcblas.so + ln -sf libopenblasp-r$version.so libcblas.so.${_lapackver:0:1} + ln -sf libopenblasp-r$version.so libcblas.so.${_lapackver} # LAPACK # provided by lapack - #rm -r $PKG/usr/lib/liblapack.so.3 # LAPACKE # provided by lapack - rm -r $PKG/usr/include/lapacke{.h,_config.h,_mangling.h,_utils.h} - #rm -r $PKG/usr/lib/liblapacke.so.3 + rm -r $PKG/usr/include/lapacke* + # fix paths sed -i 's|'$PKG'||g' $PKG/usr/lib/cmake/$name/*.cmake sed -i 's|'$PKG'||g' $PKG/usr/lib/pkgconfig/openblas.pc @@ -41,4 +40,8 @@ build () { # remove host CPU info if built with DYNAMIC_ARCH=1 sed -i '/#define OPENBLAS_NEEDBUNDERSCORE/,/#define OPENBLAS_VERSION/{//!d}' \ $PKG/usr/include/openblas_config.h + + # provide pkgconfig files for blas and cblas + ln -s openblas.pc $PKG/usr/lib/pkgconfig/blas.pc + ln -s openblas.pc $PKG/usr/lib/pkgconfig/cblas.pc }

1 0

ports/contrib (3.5): r: 3.6.1 -> 3.6.2
by crux＠crux.nu 04 Feb '20

04 Feb '20

commit db956d1fd91af269a3d2d152abdc89d5ede64da9 Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Feb 4 15:59:09 2020 +0000 r: 3.6.1 -> 3.6.2 diff --git a/r/.footprint b/r/.footprint index 3c3d705cc..4f72864f7 100644 --- a/r/.footprint +++ b/r/.footprint @@ -88,38 +88,6 @@ drwxr-xr-x root/root usr/lib/R/bin/exec/ -rwxr-xr-x root/root usr/lib/R/bin/mkinstalldirs -rwxr-xr-x root/root usr/lib/R/bin/pager -rwxr-xr-x root/root usr/lib/R/bin/rtags -drwxr-xr-x root/root usr/lib/R/doc/ --rw-r--r-- root/root usr/lib/R/doc/BioC_mirrors.csv --rw-r--r-- root/root usr/lib/R/doc/COPYRIGHTS --rw-r--r-- root/root usr/lib/R/doc/CRAN_mirrors.csv --rw-r--r-- root/root usr/lib/R/doc/FAQ --rw-r--r-- root/root usr/lib/R/doc/KEYWORDS --rw-r--r-- root/root usr/lib/R/doc/KEYWORDS.db --rw-r--r-- root/root usr/lib/R/doc/RESOURCES -drwxr-xr-x root/root usr/lib/R/doc/html/ --rw-r--r-- root/root usr/lib/R/doc/html/R.css --rw-r--r-- root/root usr/lib/R/doc/html/Rlogo.pdf --rw-r--r-- root/root usr/lib/R/doc/html/Rlogo.svg --rw-r--r-- root/root usr/lib/R/doc/html/Search.html --rw-r--r-- root/root usr/lib/R/doc/html/SearchOn.html --rw-r--r-- root/root usr/lib/R/doc/html/about.html --rw-r--r-- root/root usr/lib/R/doc/html/favicon.ico --rw-r--r-- root/root usr/lib/R/doc/html/index.html --rw-r--r-- root/root usr/lib/R/doc/html/left.jpg --rw-r--r-- root/root usr/lib/R/doc/html/logo.jpg --rw-r--r-- root/root usr/lib/R/doc/html/packages-head-utf8.html --rw-r--r-- root/root usr/lib/R/doc/html/packages.html --rw-r--r-- root/root usr/lib/R/doc/html/resources.html --rw-r--r-- root/root usr/lib/R/doc/html/right.jpg --rw-r--r-- root/root usr/lib/R/doc/html/up.jpg -drwxr-xr-x root/root usr/lib/R/doc/manual/ -drwxr-xr-x root/root usr/lib/R/doc/manual/images/ --rw-r--r-- root/root usr/lib/R/doc/manual/images/QQ.png --rw-r--r-- root/root usr/lib/R/doc/manual/images/ecdf.png --rw-r--r-- root/root usr/lib/R/doc/manual/images/fig11.png --rw-r--r-- root/root usr/lib/R/doc/manual/images/fig12.png --rw-r--r-- root/root usr/lib/R/doc/manual/images/hist.png --rw-r--r-- root/root usr/lib/R/doc/manual/images/ice.png drwxr-xr-x root/root usr/lib/R/etc/ lrwxrwxrwx root/root usr/lib/R/etc/Makeconf -> /etc/R/Makeconf lrwxrwxrwx root/root usr/lib/R/etc/Renviron -> /etc/R/Renviron @@ -128,6 +96,8 @@ lrwxrwxrwx root/root usr/lib/R/etc/ldpaths -> /etc/R/ldpaths lrwxrwxrwx root/root usr/lib/R/etc/repositories -> /etc/R/repositories drwxr-xr-x root/root usr/lib/R/lib/ -rwxr-xr-x root/root usr/lib/R/lib/libR.so +-rwxr-xr-x root/root usr/lib/R/lib/libRblas.so +-rwxr-xr-x root/root usr/lib/R/lib/libRlapack.so drwxr-xr-x root/root usr/lib/R/library/ drwxr-xr-x root/root usr/lib/R/library/KernSmooth/ -rw-r--r-- root/root usr/lib/R/library/KernSmooth/DESCRIPTION @@ -260,31 +230,6 @@ drwxr-xr-x root/root usr/lib/R/library/Matrix/data/ -rw-r--r-- root/root usr/lib/R/library/Matrix/data/CAex.R -rw-r--r-- root/root usr/lib/R/library/Matrix/data/KNex.R -rw-r--r-- root/root usr/lib/R/library/Matrix/data/USCounties.R -drwxr-xr-x root/root usr/lib/R/library/Matrix/doc/ --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Announce.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Comparisons.R --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Comparisons.Rnw --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Comparisons.pdf --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Design-issues.R --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Design-issues.Rnw --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Design-issues.pdf --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Intro2Matrix.R --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Intro2Matrix.Rnw --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Intro2Matrix.pdf --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Introduction.R --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Introduction.Rnw --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/Introduction.pdf -drwxr-xr-x root/root usr/lib/R/library/Matrix/doc/SuiteSparse/ --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/AMD.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/CHOLMOD.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/COLAMD.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/SPQR.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/SuiteSparse_config.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/SuiteSparse/UserGuides.txt --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/index.html --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/sparseModels.R --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/sparseModels.Rnw --rw-r--r-- root/root usr/lib/R/library/Matrix/doc/sparseModels.pdf drwxr-xr-x root/root usr/lib/R/library/Matrix/external/ -rw-r--r-- root/root usr/lib/R/library/Matrix/external/CAex_slots.rda -rw-r--r-- root/root usr/lib/R/library/Matrix/external/KNex_slots.rda @@ -836,22 +781,6 @@ drwxr-xr-x root/root usr/lib/R/library/grid/R/ -rw-r--r-- root/root usr/lib/R/library/grid/R/grid -rw-r--r-- root/root usr/lib/R/library/grid/R/grid.rdb -rw-r--r-- root/root usr/lib/R/library/grid/R/grid.rdx -drwxr-xr-x root/root usr/lib/R/library/grid/doc/ --rw-r--r-- root/root usr/lib/R/library/grid/doc/DivByZero.txt --rw-r--r-- root/root usr/lib/R/library/grid/doc/changes.txt --rw-r--r-- root/root usr/lib/R/library/grid/doc/displaylist.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/frame.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/grid.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/grobs.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/interactive.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/locndimn.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/moveline.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/nonfinite.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/plotexample.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/rotated.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/saveload.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/sharing.pdf --rw-r--r-- root/root usr/lib/R/library/grid/doc/viewports.pdf drwxr-xr-x root/root usr/lib/R/library/grid/help/ -rw-r--r-- root/root usr/lib/R/library/grid/help/AnIndex -rw-r--r-- root/root usr/lib/R/library/grid/help/aliases.rds @@ -1120,8 +1049,6 @@ drwxr-xr-x root/root usr/lib/R/library/parallel/R/ -rw-r--r-- root/root usr/lib/R/library/parallel/R/parallel -rw-r--r-- root/root usr/lib/R/library/parallel/R/parallel.rdb -rw-r--r-- root/root usr/lib/R/library/parallel/R/parallel.rdx -drwxr-xr-x root/root usr/lib/R/library/parallel/doc/ --rw-r--r-- root/root usr/lib/R/library/parallel/doc/parallel.pdf drwxr-xr-x root/root usr/lib/R/library/parallel/help/ -rw-r--r-- root/root usr/lib/R/library/parallel/help/AnIndex -rw-r--r-- root/root usr/lib/R/library/parallel/help/aliases.rds @@ -1154,14 +1081,6 @@ drwxr-xr-x root/root usr/lib/R/library/rpart/data/ -rw-r--r-- root/root usr/lib/R/library/rpart/data/Rdata.rdb -rw-r--r-- root/root usr/lib/R/library/rpart/data/Rdata.rds -rw-r--r-- root/root usr/lib/R/library/rpart/data/Rdata.rdx -drwxr-xr-x root/root usr/lib/R/library/rpart/doc/ --rw-r--r-- root/root usr/lib/R/library/rpart/doc/index.html --rw-r--r-- root/root usr/lib/R/library/rpart/doc/longintro.R --rw-r--r-- root/root usr/lib/R/library/rpart/doc/longintro.Rnw --rw-r--r-- root/root usr/lib/R/library/rpart/doc/longintro.pdf --rw-r--r-- root/root usr/lib/R/library/rpart/doc/usercode.R --rw-r--r-- root/root usr/lib/R/library/rpart/doc/usercode.Rnw --rw-r--r-- root/root usr/lib/R/library/rpart/doc/usercode.pdf drwxr-xr-x root/root usr/lib/R/library/rpart/help/ -rw-r--r-- root/root usr/lib/R/library/rpart/help/AnIndex -rw-r--r-- root/root usr/lib/R/library/rpart/help/aliases.rds @@ -1376,41 +1295,6 @@ drwxr-xr-x root/root usr/lib/R/library/survival/data/ -rw-r--r-- root/root usr/lib/R/library/survival/data/Rdata.rdb -rw-r--r-- root/root usr/lib/R/library/survival/data/Rdata.rds -rw-r--r-- root/root usr/lib/R/library/survival/data/Rdata.rdx -drwxr-xr-x root/root usr/lib/R/library/survival/doc/ --rw-r--r-- root/root usr/lib/R/library/survival/doc/adjcurve.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/adjcurve.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/adjcurve.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/compete.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/compete.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/compete.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/concordance.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/concordance.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/concordance.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/index.html --rw-r--r-- root/root usr/lib/R/library/survival/doc/multi.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/multi.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/multi.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/population.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/population.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/population.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/splines.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/splines.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/splines.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/survival.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/survival.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/survival.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/tests.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/tests.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/tests.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/tiedtimes.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/tiedtimes.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/tiedtimes.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/timedep.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/timedep.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/timedep.pdf --rw-r--r-- root/root usr/lib/R/library/survival/doc/validate.R --rw-r--r-- root/root usr/lib/R/library/survival/doc/validate.Rnw --rw-r--r-- root/root usr/lib/R/library/survival/doc/validate.pdf drwxr-xr-x root/root usr/lib/R/library/survival/help/ -rw-r--r-- root/root usr/lib/R/library/survival/help/AnIndex -rw-r--r-- root/root usr/lib/R/library/survival/help/aliases.rds @@ -1830,8 +1714,6 @@ drwxr-xr-x root/root usr/lib/R/library/utils/R/ drwxr-xr-x root/root usr/lib/R/library/utils/Sweave/ -rw-r--r-- root/root usr/lib/R/library/utils/Sweave/Sweave-test-1.Rnw -rw-r--r-- root/root usr/lib/R/library/utils/Sweave/example-1.Rnw -drwxr-xr-x root/root usr/lib/R/library/utils/doc/ --rw-r--r-- root/root usr/lib/R/library/utils/doc/Sweave.pdf drwxr-xr-x root/root usr/lib/R/library/utils/help/ -rw-r--r-- root/root usr/lib/R/library/utils/help/AnIndex -rw-r--r-- root/root usr/lib/R/library/utils/help/aliases.rds @@ -1872,17 +1754,6 @@ drwxr-xr-x root/root usr/share/R/encodings/ -rw-r--r-- root/root usr/share/R/encodings/character-sets drwxr-xr-x root/root usr/share/R/java/ -rw-r--r-- root/root usr/share/R/java/getsp.class -drwxr-xr-x root/root usr/share/R/licenses/ --rw-r--r-- root/root usr/share/R/licenses/AGPL-3 --rw-r--r-- root/root usr/share/R/licenses/Artistic-2.0 --rw-r--r-- root/root usr/share/R/licenses/BSD_2_clause --rw-r--r-- root/root usr/share/R/licenses/BSD_3_clause --rw-r--r-- root/root usr/share/R/licenses/GPL-2 --rw-r--r-- root/root usr/share/R/licenses/GPL-3 --rw-r--r-- root/root usr/share/R/licenses/LGPL-2 --rw-r--r-- root/root usr/share/R/licenses/LGPL-2.1 --rw-r--r-- root/root usr/share/R/licenses/LGPL-3 --rw-r--r-- root/root usr/share/R/licenses/MIT drwxr-xr-x root/root usr/share/R/make/ -rw-r--r-- root/root usr/share/R/make/basepkg.mk -rw-r--r-- root/root usr/share/R/make/check_vars_ini.mk diff --git a/r/.signature b/r/.signature index 2e73f8694..58edb454d 100644 --- a/r/.signature +++ b/r/.signature @@ -1,8 +1,11 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xgy83CtPVrOMcf6cZOJ5elrExcud4eUyusViI6zjuGdsWN0RePaq9sUXoN4yYEFbaqQvDprLGhZBrNCr9JdUAc= -SHA256 (Pkgfile) = f53c14e3a59d436e7393c6da5f248f4969c1d82b9a674fed1540a7ed5df4cdcf -SHA256 (.footprint) = 62858cf2eb104a51165ffaf00c60fe586bc24787ae76b456e34868ec36c63cfd -SHA256 (R-3.6.1.tar.gz) = 5baa9ebd3e71acecdcc3da31d9042fb174d55a42829f8315f2457080978b1389 +RWSagIOpLGJF35yKQSTG+lMuz08QKR25MgftG1fCAxiAEtE+6rWGwx7OmWUfJPpqnvroHDMxowYnd3Z9DrXchgEZ7JjDPPbH2wc= +SHA256 (Pkgfile) = 0f7593a56318f8c524e3f1f0162f649925fb9e8d3ba8dae1e6f2f6d0aad88515 +SHA256 (.footprint) = 4988b07fcceebb90ca0fb6a8d30e8c149226573050f647f4fa0ea0fc7de340fe +SHA256 (R-3.6.2.tar.gz) = bd65a45cddfb88f37370fbcee4ac8dd3f1aebeebe47c2f968fd9770ba2bbc954 SHA256 (r.desktop) = 25b01ea93fa704884b65ba002d44d4e99725bd826997e8c73b6467df9f23c798 SHA256 (r.png) = 465b623f15d8144fb30b52791047a22302c275d51f749d8732454e4496c1a989 SHA256 (R.conf) = 01057f4dd3d0eca3e31090b2793ab17ed6648501513f6cfea36a0c609a55ac5e +SHA256 (R-3.4.1-parallel.patch) = 7d08b75592f9452b1f92bfe148f9d24fd19ba9163cd16ee2dac753f2c1a891be +SHA256 (R-3.4.1-rmath-shared.patch) = 76a2d04b3a77884baa3cf84b25920f875e026b73c217c59b06aba2fae634f858 +SHA256 (R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch) = 5611b1c168ff338a4164302fc265be150700ebbca49a33b55973810fe5519b6e diff --git a/r/Pkgfile b/r/Pkgfile index eb146fc32..ed8fbbb9b 100644 --- a/r/Pkgfile +++ b/r/Pkgfile @@ -2,18 +2,39 @@ # URL: https://www.r-project.org/ # Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: openblas zstd -# Optional: texlive tk +# Optional: lapack openjdk8 texlive tk name=r -version=3.6.1 +version=3.6.2 release=1 source=(https://cran.r-project.org/src/base/R-3/R-$version.tar.gz - r.desktop r.png R.conf) + r.desktop r.png R.conf + R-3.4.1-parallel.patch R-3.4.1-rmath-shared.patch + R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch) build() { cd R-$version + + # https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-lang/R/files + patch -Np1 -i $SRC/R-3.4.1-parallel.patch + patch -Np1 -i $SRC/R-3.4.1-rmath-shared.patch + patch -Np1 -i $SRC/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch + + # configuring R [[ -e /usr/lib/pkgconfig/tk.pc ]] && PKGMK_R+=" --with-x=yes" || PKGMK_R+=" --with-x=no" + [[ -e /usr/lib/pkgconfig/lapack.pc ]] && PKGMK_R+=" --with-lapack LAPACK_LIBS=$(pkg-config --libs lapack)" + # this needs a properly working java environment! + [[ -e $(whereis javac) ]] && PKGMK_R+=" --enable-java" || PKGMK_R+=" --disable-java" + + # set the correct dir for texmf distribution sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in + + unset R_HOME + + # version 3.6.2 needs at least the addition to FCFLAGS + export CFLAGS+=' -fPIC' + export CPPFLAGS+=' -fPIC' + export FCFLAGS+=' -fPIC' ./configure $PKGMK_R \ --prefix=/usr \ --libdir=/usr/lib \ @@ -21,20 +42,28 @@ build() { --datarootdir=/usr/share \ rsharedir=/usr/share/R/ \ rincludedir=/usr/include/R/ \ - --enable-R-shlib \ - --with-lapack \ - --with-blas \ F77=gfortran \ - LIBnn=lib + LIBnn=lib \ + BLAS_LIBS=$(pkg-config --libs blas) \ + PKG_CONFIG=/usr/bin/pkg-config \ + --with-blas \ + --enable-BLAS-shlib \ + --enable-R-shlib \ + --enable-byte-compiled-packages \ + --disable-nls make + # make nmath library pushd src/nmath/standalone make shared popd + + # install R to $PKG make DESTDIR=$PKG install + # same for the nmath library pushd src/nmath/standalone make DESTDIR=$PKG install - popd + #popd sed -i "s|$PKG ||" "$PKG/usr/bin/R" rm "$PKG/usr/lib/R/bin/R" @@ -63,8 +92,9 @@ build() { -iname '*THANKS*' -o \ -iname '*NEWS*' -o \ -iname '*LICENSE*' -o \ + -iname 'doc' -o \ -iname '*CHANGELOG*' \ - \) -exec rm '{}' \+ || true + \) -exec rm -r '{}' \+ || true #doh! don't remove INSTALL or you won't be able to install R packages #-iname '*INSTALL*' -o \ } diff --git a/r/R-3.4.1-parallel.patch b/r/R-3.4.1-parallel.patch new file mode 100644 index 000000000..6fac15b9f --- /dev/null +++ b/r/R-3.4.1-parallel.patch @@ -0,0 +1,11 @@ +--- a/src/include/Makefile.in 2017-07-05 23:09:09.682703655 +0000 ++++ b/src/include/Makefile.in 2017-07-05 23:06:56.533612308 +0000 +@@ -81,7 +81,7 @@ + Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status + @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@ ++install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@ + @for d in $(SUBDIRS); do \ + (cd $${d} && $(MAKE) $@) || exit 1; \ + done diff --git a/r/R-3.4.1-rmath-shared.patch b/r/R-3.4.1-rmath-shared.patch new file mode 100644 index 000000000..8bc6233de --- /dev/null +++ b/r/R-3.4.1-rmath-shared.patch @@ -0,0 +1,21 @@ +--- a/src/nmath/standalone/Makefile.in 2017-07-05 23:20:26.098087600 +0000 ++++ b/src/nmath/standalone/Makefile.in 2017-07-05 23:21:55.087480310 +0000 +@@ -64,7 +64,8 @@ + Rexeclibdir_LTLIBRARIES = $(libRmath_la) + libRmath_la_SOURCES = $(SOURCES) + libRmath_la_OBJECTS = $(OBJECTS:.o=.lo) +-libRmath_la_LDFLAGS = ++libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so ++libRmath_la_LIBADD = $(LIBM) + + CLEANFILES = Makedeps *.d *.o *.lo test check.log $(SOURCES) + DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) +@@ -127,7 +128,7 @@ + + ## under peculiar circumstances, $(LIBM) here helps. + $(libRmath_la): $(libRmath_la_OBJECTS) +- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM) ++ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ + + test: $(srcdir)/test.c + $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \ diff --git a/r/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch b/r/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch new file mode 100644 index 000000000..2bcf50cca --- /dev/null +++ b/r/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch @@ -0,0 +1,11 @@ +--- R-3.6.2-orig/src/unix/Makefile.in 2019-03-29 10:02:31.000000000 +1100 ++++ R-3.6.2/src/unix/Makefile.in 2020-01-13 22:39:14.506804106 +1100 +@@ -79,7 +79,7 @@ + -e "s:@rincludedir:$(rincludedir):" \ + -e "s:@rarch:$(R_ARCH):" \ + -e 's:@libsprivate:$(STATIC_LIBR_PC):' \ +- -e 's:@others:$(MAIN_LDFLAGS) $(LDFLAGS):' \ ++ -e 's:@others:$(MAIN_LDFLAGS):' \ + -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ + > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc" +

1 0