Updated to 6.05.1

3 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c208f0f630b..db225cbfcac3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xscreensaver-xmatrix-color
 	pkgdesc = Screen saver and locker for the X Window System, modified xmatrix with variable color.
-	pkgver = 6.03
+	pkgver = 6.05.1
 	pkgrel = 1
 	url = http://www.jwz.org/xscreensaver/
 	arch = i686
@@ -19,13 +19,13 @@ pkgbase = xscreensaver-xmatrix-color
 	provides = xscreensaver
 	conflicts = xscreensaver
 	backup = etc/pam.d/xscreensaver
-	source = http://www.jwz.org/xscreensaver/xscreensaver-6.03.tar.gz
+	source = http://www.jwz.org/xscreensaver/xscreensaver-6.05.1.tar.gz
 	source = xscreensaver-add-electricsheep.diff
 	source = xmatrix-color.diff
 	source = LICENSE
-	sha1sums = fd87403e1f5a3e98867362cb0046cdd83b2d9dd9
+	sha1sums = 1eb3ba5bd21494a8e64d5098702936c3c75499e2
 	sha1sums = e8dc57b6471fb3867ee099304ac6bf628351cb98
-	sha1sums = 061a488885bf0265529a04772eae63b24912c1a1
+	sha1sums = 4d1d5bbec588273ee94484feea84d5003cf52d7d
 	sha1sums = bf8995d86609cdab678ca277ae685407f82691db
 
 pkgname = xscreensaver-xmatrix-color
diff --git a/PKGBUILD b/PKGBUILD
index 862ab6dcb43f..f6c7f09eff66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # $Id$
 
 pkgname=xscreensaver-xmatrix-color
-pkgver=6.03
+pkgver=6.05.1
+jwzspecialver=6.05 # Because the 6.05.1 zip unpacks to 6.05
 pkgrel=1
 pkgdesc="Screen saver and locker for the X Window System, modified xmatrix with variable color."
 arch=('i686' 'x86_64')
@@ -17,19 +18,21 @@ source=(http://www.jwz.org/xscreensaver/${pkgname%%-*}-${pkgver}.tar.gz
 	xscreensaver-add-electricsheep.diff
 	xmatrix-color.diff
 	LICENSE)
-sha1sums=('04b272b7b4eadb68e812c682148162bd59d3b9f8'
+sha1sums=('1eb3ba5bd21494a8e64d5098702936c3c75499e2'
           'e8dc57b6471fb3867ee099304ac6bf628351cb98'
-          '061a488885bf0265529a04772eae63b24912c1a1'
+          '4d1d5bbec588273ee94484feea84d5003cf52d7d'
           'bf8995d86609cdab678ca277ae685407f82691db')
 
 prepare() {
-  cd ${pkgname%%-*}-${pkgver}
+  #cd ${pkgname%%-*}-${pkgver}
+  cd ${pkgname%%-*}-${jwzspecialver}
   patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff"
   patch -b -p0 -i "${srcdir}/xmatrix-color.diff"
 }
 
 build() {
-  cd ${pkgname%%-*}-${pkgver}
+  #cd ${pkgname%%-*}-${pkgver}
+  cd ${pkgname%%-*}-${jwzspecialver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib \
     --with-pam --with-login-manager --with-gtk --with-gl \
@@ -38,7 +41,8 @@ build() {
 }
 
 package() {
-  cd ${pkgname%%-*}-${pkgver}
+  #cd ${pkgname%%-*}-${pkgver}
+  cd ${pkgname%%-*}-${jwzspecialver}
   install -d "${pkgdir}/etc/pam.d"
   make install_prefix="${pkgdir}" install
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname%%-*}/LICENSE"
diff --git a/xmatrix-color.diff b/xmatrix-color.diff
index d9d416ad92b6..cb14d3238827 100644
--- a/xmatrix-color.diff
+++ b/xmatrix-color.diff
@@ -177,17 +177,17 @@
    </hgroup>
  
    <hgroup>
---- hacks/xmatrix.man	2021-01-25 10:00:59.634582133 -0600
-+++ hacks/xmatrix.man.mod	2021-10-22 10:25:36.214586238 -0500
-@@ -13,6 +13,7 @@
- [\-mode \fImode\fP]
- [\-phone \fInumber\fP]
- [\-fps]
+--- hacks/xmatrix.man	2022-09-04 11:40:03.613534185 -0500
++++ hacks/xmatrix.man.mod	2022-10-09 09:09:15.744682643 -0500
+@@ -14,6 +14,7 @@
+ [\-\-mode \fImode\fP]
+ [\-\-phone \fInumber\fP]
+ [\-\-fps]
 +[\-color\-shift \fIcolor\fP]
  .SH DESCRIPTION
  The \fIxmatrix\fP program draws the 2D "digital rain" effect, as seen on
- the computer monitors in the Wachowski brothers' film, "The Matrix".
-@@ -109,6 +110,10 @@
+ the computer monitors in the 1999 film, "The Matrix".
+@@ -113,6 +114,10 @@
  	xmatrix -ascii -program 'ps -eo comm | rev'
  	xmatrix -program 'od -txC -w6 /dev/random'
  	xmatrix -program 'cat /dev/random'
@@ -199,3 +199,4 @@
  .fi
  .SH ENVIRONMENT
 
+