sps-extra · log · files · refs · tags · releases · people · languages · GitHub · commit
bdca933
Fix unfetchable sources, duplicate depends, and a bad site-packages path
Parents
Stat
admin/at/recipe | 2 +-
audio/lame/recipe | 2 +-
cli/lftp/recipe | 2 +-
devel/patchutils/recipe | 2 +-
devel/python-pyparsing/recipe | 8 ++++++--
devel/yasm/recipe | 2 +-
games/minetest/recipe | 1 -
graphics/darktable/recipe | 1 -
libs/libdaemon/recipe | 2 +-
libs/libev/recipe | 2 +-
libs/libptytty/recipe | 2 +-
libs/stfl/recipe | 9 ++++++---
libs/{libisoburn => xorriso}/recipe | 0
libs/yajl/recipe | 10 +++++++---
net/iftop/recipe | 2 +-
security/paperkey/recipe | 2 +-
sys/runit/recipe | 2 +-
x11/i3status/recipe | 1 -
x11/openbox/recipe | 2 +-
x11/rxvt-unicode/recipe | 2 +-
x11/wmctrl/recipe | 10 +++++++---
21 files changed, 39 insertions(+), 27 deletions(-)
Diff
diff --git a/admin/at/recipe b/admin/at/recipe
index ed85969..d6e1599 100644
--- a/admin/at/recipe
+++ b/admin/at/recipe
@@ -3,7 +3,7 @@ version 3.2.5
release 2
description at: schedule commands for later
-source http://deb.debian.org/debian/pool/main/a/at/at_3.2.5.orig.tar.gz
+source https://deb.debian.org/debian/pool/main/a/at/at_3.2.5.orig.tar.gz
hash sha256:bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8
depend filesystem
diff --git a/audio/lame/recipe b/audio/lame/recipe
index a233b5a..eb8abe9 100644
--- a/audio/lame/recipe
+++ b/audio/lame/recipe
@@ -3,7 +3,7 @@ version 3.100
release 1
description lame: MP3 encoder
-source http://deb.debian.org/debian/pool/main/l/lame/lame_3.100.orig.tar.gz
+source https://deb.debian.org/debian/pool/main/l/lame/lame_3.100.orig.tar.gz
hash sha256:ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e
depend filesystem
diff --git a/cli/lftp/recipe b/cli/lftp/recipe
index fdf8932..e8f7831 100644
--- a/cli/lftp/recipe
+++ b/cli/lftp/recipe
@@ -3,7 +3,7 @@ version 4.9.3
release 1
description lftp: sophisticated file transfer program
-source http://lftp.yar.ru/ftp/lftp-4.9.3.tar.gz
+source https://lftp.yar.ru/ftp/lftp-4.9.3.tar.gz
hash sha256:68116cc184ab660a78a4cef323491e89909e5643b59c7b5f0a14f7c2b20e0a29
depend filesystem
diff --git a/devel/patchutils/recipe b/devel/patchutils/recipe
index c52c8cc..293cd44 100644
--- a/devel/patchutils/recipe
+++ b/devel/patchutils/recipe
@@ -3,7 +3,7 @@ version 0.4.2
release 1
description patchutils: tools for working with patch files
-source http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.4.2.tar.xz
+source https://cyberelk.net/tim/data/patchutils/stable/patchutils-0.4.2.tar.xz
hash sha256:8875b0965fe33de62b890f6cd793be7fafe41a4e552edbf641f1fed5ebbf45ed
depend filesystem
diff --git a/devel/python-pyparsing/recipe b/devel/python-pyparsing/recipe
index 8d28ca2..23db03f 100644
--- a/devel/python-pyparsing/recipe
+++ b/devel/python-pyparsing/recipe
@@ -1,6 +1,6 @@
name python-pyparsing
version 3.3.2
-release 1
+release 2
arch any
description python-pyparsing: Python parsing module
@@ -10,4 +10,8 @@ hash sha256:2fc0d57452389101faf2a0148c8803fc6420448df2819dc33a0df83141c1b
depend filesystem
depend python
-install pyver=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])'); mkdir -p "$PKG/usr/lib/python$pyver/site-packages"; cp -a pyparsing "$PKG/usr/lib/python$pyver/site-packages/"
+# SPS builds CPython with --with-platlibdir=lib64, so site-packages is under
+# /usr/lib64. Installing into /usr/lib leaves the module unimportable.
+install pyver=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])'); \
+ mkdir -p "$PKG/usr/lib64/python$pyver/site-packages"; \
+ cp -a pyparsing "$PKG/usr/lib64/python$pyver/site-packages/"
diff --git a/devel/yasm/recipe b/devel/yasm/recipe
index 570dcf1..c63768a 100644
--- a/devel/yasm/recipe
+++ b/devel/yasm/recipe
@@ -3,7 +3,7 @@ version 1.3.0
release 1
description yasm: modular assembler
-source http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
+source https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
hash sha256:3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
depend filesystem
diff --git a/games/minetest/recipe b/games/minetest/recipe
index 5d547c7..c31162f 100644
--- a/games/minetest/recipe
+++ b/games/minetest/recipe
@@ -18,7 +18,6 @@ depend libvorbis
depend libogg
depend freetype
depend mesa
-depend sqlite
depend luajit
depend sdl2
builddep cmake
diff --git a/graphics/darktable/recipe b/graphics/darktable/recipe
index 2848a8f..d9147c3 100644
--- a/graphics/darktable/recipe
+++ b/graphics/darktable/recipe
@@ -19,7 +19,6 @@ depend sqlite
depend curl
depend json-glib
depend zlib
-depend pugixml
depend libxml2
depend iso-codes
builddep cmake
diff --git a/libs/libdaemon/recipe b/libs/libdaemon/recipe
index bdbbf06..69bbf04 100644
--- a/libs/libdaemon/recipe
+++ b/libs/libdaemon/recipe
@@ -3,7 +3,7 @@ version 0.14
release 1
description libdaemon: UNIX daemonizing library
-source http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
+source https://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
hash sha256:fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834
depend filesystem
diff --git a/libs/libev/recipe b/libs/libev/recipe
index b2be77b..323c173 100644
--- a/libs/libev/recipe
+++ b/libs/libev/recipe
@@ -3,7 +3,7 @@ version 4.33
release 1
description libev: event loop library
-source http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
+source https://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
hash sha256:507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea
depend filesystem
diff --git a/libs/libptytty/recipe b/libs/libptytty/recipe
index a88d991..a918dd5 100644
--- a/libs/libptytty/recipe
+++ b/libs/libptytty/recipe
@@ -3,7 +3,7 @@ version 2.0
release 1
description libptytty: pty/tty helper library
-source http://dist.schmorp.de/libptytty/libptytty-2.0.tar.gz
+source https://dist.schmorp.de/libptytty/libptytty-2.0.tar.gz
hash sha256:8033ed3aadf28759660d4f11f2d7b030acf2a6890cb0f7926fb0cfa6739d31f7
depend filesystem
diff --git a/libs/stfl/recipe b/libs/stfl/recipe
index f3c9d88..daede60 100644
--- a/libs/stfl/recipe
+++ b/libs/stfl/recipe
@@ -1,10 +1,13 @@
name stfl
version 0.24
-release 1
+release 2
description stfl: structured terminal forms library
-source http://www.clifford.at/stfl/stfl-0.24.tar.gz
-hash sha256:f97f1431f0dc2313b104c3777624205c2d48baa3aa8cd36f850634e7ff577709
+# clifford.at no longer serves the tarball; the old URL returns the site's
+# HTML front page. Void's distfiles mirror and the Wayback capture of the
+# original release agree on this digest.
+source https://sources.voidlinux.org/stfl-${version}/stfl-${version}.tar.gz
+hash sha256:d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090
depend filesystem
depend ncurses
diff --git a/libs/libisoburn/recipe b/libs/xorriso/recipe
similarity index 100%
rename from libs/libisoburn/recipe
rename to libs/xorriso/recipe
diff --git a/libs/yajl/recipe b/libs/yajl/recipe
index 8b76f68..92521c2 100644
--- a/libs/yajl/recipe
+++ b/libs/yajl/recipe
@@ -1,10 +1,14 @@
name yajl
version 2.1.0
-release 1
+release 2
description yajl: Yet Another JSON Library
-source https://github.com/lloyd/yajl/archive/2.1.0.tar.gz
-hash sha256:2d1bc48c597932a433938fe78a3d0f264f90a85f5fa8c4b2713a35d68809da33
+# The repository carries both a tag and a branch named 2.1.0, so the short
+# /archive/2.1.0.tar.gz form is ambiguous and GitHub answers it with
+# "the given path has multiple possibilities" instead of a tarball. The
+# refs/tags spelling is unambiguous.
+source https://github.com/lloyd/yajl/archive/refs/tags/${version}.tar.gz
+hash sha256:3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a
depend filesystem
builddep cmake
diff --git a/net/iftop/recipe b/net/iftop/recipe
index 161dbe8..80e456e 100644
--- a/net/iftop/recipe
+++ b/net/iftop/recipe
@@ -3,7 +3,7 @@ version 1.0pre4
release 1
description iftop: display bandwidth by host
-source http://www.ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz
+source https://www.ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz
hash sha256:f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97
depend filesystem
diff --git a/security/paperkey/recipe b/security/paperkey/recipe
index 7dfc1a4..a99b26e 100644
--- a/security/paperkey/recipe
+++ b/security/paperkey/recipe
@@ -3,7 +3,7 @@ version 1.6
release 1
description paperkey: export OpenPGP keys for print
-source http://www.jabberwocky.com/software/paperkey/paperkey-1.6.tar.gz
+source https://www.jabberwocky.com/software/paperkey/paperkey-1.6.tar.gz
hash sha256:a245fd13271a8d2afa03dde979af3a29eb3d4ebb1fbcad4a9b52cf67a27d05f7
depend filesystem
diff --git a/sys/runit/recipe b/sys/runit/recipe
index e9eb90f..b238387 100644
--- a/sys/runit/recipe
+++ b/sys/runit/recipe
@@ -2,7 +2,7 @@ name runit
version 2.2.0
release 2
description runit: process supervision and init
-source http://smarden.org/runit/runit-2.2.0.tar.gz
+source https://smarden.org/runit/runit-2.2.0.tar.gz
hash sha256:95ef4d2868b978c7179fe47901e5c578e11cf273d292bd6208bd3a7ccb029290
depend filesystem
conflict systemd
diff --git a/x11/i3status/recipe b/x11/i3status/recipe
index ec315b9..a1d2198 100644
--- a/x11/i3status/recipe
+++ b/x11/i3status/recipe
@@ -10,7 +10,6 @@ depend filesystem
depend yajl
depend alsa-lib
depend libconfuse
-depend yajl
builddep meson
builddep ninja
diff --git a/x11/openbox/recipe b/x11/openbox/recipe
index b7d95b1..1c09905 100644
--- a/x11/openbox/recipe
+++ b/x11/openbox/recipe
@@ -3,7 +3,7 @@ version 3.6.1
release 1
description openbox: stacking window manager
-source http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz
+source https://openbox.org/dist/openbox/openbox-3.6.1.tar.gz
hash sha256:8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7
depend filesystem
diff --git a/x11/rxvt-unicode/recipe b/x11/rxvt-unicode/recipe
index 0ffb5a0..8406930 100644
--- a/x11/rxvt-unicode/recipe
+++ b/x11/rxvt-unicode/recipe
@@ -3,7 +3,7 @@ version 9.31
release 1
description rxvt-unicode: unicode rxvt clone
-source http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.31.tar.bz2
+source https://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.31.tar.bz2
hash sha256:aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8
depend filesystem
diff --git a/x11/wmctrl/recipe b/x11/wmctrl/recipe
index 7aec5c3..60f4570 100644
--- a/x11/wmctrl/recipe
+++ b/x11/wmctrl/recipe
@@ -1,13 +1,17 @@
name wmctrl
version 1.07
-release 1
+release 2
description wmctrl: control EWMH window managers
-source https://sites.google.com/site/tstyblo/wmctrl/wmctrl-1.07.tar.gz
-hash sha256:71fc65c256c23950058b6ce57b5b4c44a58f9e982e08ad11bf0b21a28774632a
+# Upstream only ever published this on sites.google.com, which now answers
+# every request with a Google account sign-in page instead of the tarball.
+# Debian carries the unmodified 1.07 release.
+source https://deb.debian.org/debian/pool/main/w/wmctrl/wmctrl_${version}.orig.tar.gz
+hash sha256:d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
depend filesystem
depend libx11
+depend libxmu
depend glib
configure ./configure --prefix=/usr