git: 359d7b9d17a8 - main - x11/xscreensaver: Update 6.09 => 6.10, take maintainership
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 07 Aug 2025 19:09:44 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=359d7b9d17a8f41a1b581699f7ce5fccbefb83f3
commit 359d7b9d17a8f41a1b581699f7ce5fccbefb83f3
Author: Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2025-08-07 19:04:09 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-08-07 19:09:18 +0000
x11/xscreensaver: Update 6.09 => 6.10, take maintainership
For some cryptic reason, outer compressed file is versioned as '6.10.1',
however all other sources, including the hyperlink label on author's
website and the inner tar directory indicate 6.10, thus we need some
WRKSRC gymnastics.
Also, regen default settings patch as last hunk from its previous
version doesn't apply anymore.
Changelog:
* New hacks, dumpsterfire, hopffibration, platonicfolding and klondike.
* Rewrote the VT100 emulator for 'apple2' and 'phosphor'. Supports
inverse and DEC Special Graphics.
* X11: phosphor scrolls fast again on "modern" Linux systems.
* BSOD supports systemd and bitlocker.
* Android: Fixed bug where photo access was not being requested.
https://www.jwz.org/xscreensaver/changelog.html
PR: 286479
Approved by: zirias (maintainer, timeout > 3 months)
---
x11/xscreensaver/Makefile | 9 +++++----
x11/xscreensaver/distinfo | 6 +++---
x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in | 10 +---------
x11/xscreensaver/pkg-plist | 10 ++++++++++
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 07f7fc17cc02..63b2cbe64e31 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,10 +1,10 @@
PORTNAME= xscreensaver
-DISTVERSION= 6.09
-PORTREVISION= 1
+DISTVERSION= 6.10
+DISTVERSIONSUFFIX= .1
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
-MAINTAINER= zirias@FreeBSD.org
+MAINTAINER= vsasjason@gmail.com
COMMENT= Save your screen while you entertain your cat
WWW= https://www.jwz.org/xscreensaver/
@@ -29,7 +29,6 @@ USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm
SHEBANG_FILES= hacks/check-configs.pl
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --enable-locking \
--with-app-defaults=${PREFIX}/lib/X11/app-defaults \
--with-configdir=${PREFIX}/share/xscreensaver/config/ \
@@ -57,6 +56,8 @@ MAKE_ARGS= install_prefix=${STAGEDIR}
SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \
xscreensaver-start.desktop xscreensaver-stop.desktop
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
OPTIONS_DEFINE= FIREF NLS NSFW SETUID_HACKS XAOS1 XDALI XEARTH XMOUN XPLANET \
XSNOW
OPTIONS_SUB= yes
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index fd7074fd3721..ac76599809e1 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718116610
-SHA256 (xscreensaver-6.09.tar.gz) = f4667705adb8cc43fd2f3973a88a1b54b16f20190afe93b21e221f2f57320b05
-SIZE (xscreensaver-6.09.tar.gz) = 22026182
+TIMESTAMP = 1754589876
+SHA256 (xscreensaver-6.10.1.tar.gz) = ffe599f9cf77afa46efb8dbb7b561e8da0c3156dea64b635e0b7e2c20f4bb3ed
+SIZE (xscreensaver-6.10.1.tar.gz) = 25081752
diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
index 78259585474f..68776b76299c 100644
--- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
+++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in
@@ -1,4 +1,4 @@
---- driver/XScreenSaver.ad.in.orig 2023-10-11 00:24:06 UTC
+--- driver/XScreenSaver.ad.in.orig 2025-04-28 19:46:11 UTC
+++ driver/XScreenSaver.ad.in
@@ -55,7 +55,7 @@
*splashDuration: 0:00:05
@@ -37,11 +37,3 @@
maze --root \n\
@GL_KLUDGE@ GL: superquadrics --root \n\
attraction --root \n\
-@@ -615,7 +627,6 @@ - lcdscrub --root \n\
- *hacks.dangerball.name: Danger Ball
- *hacks.decayscreen.name: Decay Screen
- *hacks.deepstars.name: Deep Stars
--*hacks.dnalogo.name: DNA Logo
- *hacks.dymaxionmap.name: Dymaxion Map
- *hacks.energystream.name: Energy Stream
- *hacks.etruscanvenus.name: Etruscan Venus
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 71af26273018..c0d590679f20 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -64,6 +64,7 @@ bin/xscreensaver-hacks/discrete
bin/xscreensaver-hacks/distort
bin/xscreensaver-hacks/drift
bin/xscreensaver-hacks/droste
+bin/xscreensaver-hacks/dumpsterfire
bin/xscreensaver-hacks/dymaxionmap
bin/xscreensaver-hacks/endgame
bin/xscreensaver-hacks/energystream
@@ -121,6 +122,7 @@ bin/xscreensaver-hacks/hextrail
bin/xscreensaver-hacks/highvoltage
bin/xscreensaver-hacks/hilbert
bin/xscreensaver-hacks/hopalong
+bin/xscreensaver-hacks/hopffibration
bin/xscreensaver-hacks/hydrostat
bin/xscreensaver-hacks/hypertorus
bin/xscreensaver-hacks/hypnowheel
@@ -137,6 +139,7 @@ bin/xscreensaver-hacks/kaleidescope
bin/xscreensaver-hacks/kaleidocycle
bin/xscreensaver-hacks/kallisti
bin/xscreensaver-hacks/klein
+bin/xscreensaver-hacks/klondike
bin/xscreensaver-hacks/kumppa
bin/xscreensaver-hacks/lament
bin/xscreensaver-hacks/lavalite
@@ -177,6 +180,7 @@ bin/xscreensaver-hacks/photopile
bin/xscreensaver-hacks/piecewise
bin/xscreensaver-hacks/pinion
bin/xscreensaver-hacks/pipes
+bin/xscreensaver-hacks/platonicfolding
bin/xscreensaver-hacks/polyhedra
bin/xscreensaver-hacks/polyominoes
bin/xscreensaver-hacks/polytopes
@@ -423,6 +427,7 @@ share/man/man6/hextrail.6.gz
share/man/man6/highvoltage.6.gz
share/man/man6/hilbert.6.gz
share/man/man6/hopalong.6.gz
+share/man/man6/hopffibration.6.gz
share/man/man6/hydrostat.6.gz
share/man/man6/hypertorus.6.gz
share/man/man6/hypnowheel.6.gz
@@ -478,6 +483,7 @@ share/man/man6/photopile.6.gz
share/man/man6/piecewise.6.gz
share/man/man6/pinion.6.gz
share/man/man6/pipes.6.gz
+share/man/man6/platonicfolding.6.gz
share/man/man6/polyhedra.6.gz
share/man/man6/polyominoes.6.gz
share/man/man6/polytopes.6.gz
@@ -629,6 +635,7 @@ share/pixmaps/xscreensaver.png
%%DATADIR%%/config/distort.xml
%%DATADIR%%/config/drift.xml
%%DATADIR%%/config/droste.xml
+%%DATADIR%%/config/dumpsterfire.xml
%%DATADIR%%/config/dymaxionmap.xml
%%DATADIR%%/config/endgame.xml
%%DATADIR%%/config/energystream.xml
@@ -686,6 +693,7 @@ share/pixmaps/xscreensaver.png
%%DATADIR%%/config/highvoltage.xml
%%DATADIR%%/config/hilbert.xml
%%DATADIR%%/config/hopalong.xml
+%%DATADIR%%/config/hopffibration.xml
%%DATADIR%%/config/hydrostat.xml
%%DATADIR%%/config/hypertorus.xml
%%DATADIR%%/config/hypnowheel.xml
@@ -702,6 +710,7 @@ share/pixmaps/xscreensaver.png
%%DATADIR%%/config/kaleidocycle.xml
%%DATADIR%%/config/kallisti.xml
%%DATADIR%%/config/klein.xml
+%%DATADIR%%/config/klondike.xml
%%DATADIR%%/config/kumppa.xml
%%DATADIR%%/config/lament.xml
%%DATADIR%%/config/lavalite.xml
@@ -741,6 +750,7 @@ share/pixmaps/xscreensaver.png
%%DATADIR%%/config/piecewise.xml
%%DATADIR%%/config/pinion.xml
%%DATADIR%%/config/pipes.xml
+%%DATADIR%%/config/platonicfolding.xml
%%DATADIR%%/config/polyhedra.xml
%%DATADIR%%/config/polyominoes.xml
%%DATADIR%%/config/polytopes.xml