Wed Jul 30 20:18:37 2008 UTC ()
update to 5.06
changes:
Xinerama/RANDR fixes: this time for sure. It should now work to add/remove
 monitors or resize screens at any time.
New hack, skytentacles.
New version of gleidescope.
Added the -log option to the xscreensaver daemon, since a truly shocking
 number of Linux users seem to have no idea how to redirect output to a
 file.
Added -duration arg to most image-loading hacks, so that they pick a new
 image every few minutes.
Added an ATM crash to BSOD.


(drochner)
diff -r1.96 -r1.97 pkgsrc/x11/xscreensaver/Makefile.common
diff -r1.32 -r1.33 pkgsrc/x11/xscreensaver/PLIST
diff -r1.52 -r1.53 pkgsrc/x11/xscreensaver/distinfo
diff -r1.19 -r1.20 pkgsrc/x11/xscreensaver/patches/patch-ac
diff -r0 -r1.1 pkgsrc/x11/xscreensaver/patches/patch-aj
cvs diff -r1.96 -r1.97 pkgsrc/x11/xscreensaver/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/Attic/Makefile.common 2008/03/10 12:37:12 1.96
+++ pkgsrc/x11/xscreensaver/Attic/Makefile.common 2008/07/30 20:18:36 1.97
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.96 2008/03/10 12:37:12 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.97 2008/07/30 20:18:36 drochner Exp $
2# 2#
3 3
4# When updating the package, 4# When updating the package,
5# please check kdeartwork3 -- it installs some extra 5# please check kdeartwork3 -- it installs some extra
6# files depending on which screensavers it finds. 6# files depending on which screensavers it finds.
7DISTNAME= xscreensaver-5.05 7DISTNAME= xscreensaver-5.06
8CATEGORIES= x11 8CATEGORIES= x11
9MASTER_SITES= ${HOMEPAGE} 9MASTER_SITES= ${HOMEPAGE}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.jwz.org/xscreensaver/ 12HOMEPAGE= http://www.jwz.org/xscreensaver/
13 13
14BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2 14BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0.2
15 15
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_X11= yes 17USE_X11= yes
18USE_TOOLS+= msgfmt perl 18USE_TOOLS+= msgfmt perl
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
cvs diff -r1.32 -r1.33 pkgsrc/x11/xscreensaver/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/PLIST 2008/03/10 12:37:12 1.32
+++ pkgsrc/x11/xscreensaver/PLIST 2008/07/30 20:18:36 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.32 2008/03/10 12:37:12 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.33 2008/07/30 20:18:36 drochner Exp $
2bin/xscreensaver 2bin/xscreensaver
3bin/xscreensaver-command 3bin/xscreensaver-command
4bin/xscreensaver-getimage 4bin/xscreensaver-getimage
5bin/xscreensaver-getimage-file 5bin/xscreensaver-getimage-file
6bin/xscreensaver-getimage-video 6bin/xscreensaver-getimage-video
7bin/xscreensaver-gl-helper 7bin/xscreensaver-gl-helper
8bin/xscreensaver-text 8bin/xscreensaver-text
9lib/X11/app-defaults/XScreenSaver 9lib/X11/app-defaults/XScreenSaver
10libexec/xscreensaver/abstractile 10libexec/xscreensaver/abstractile
11libexec/xscreensaver/anemone 11libexec/xscreensaver/anemone
12libexec/xscreensaver/anemotaxis 12libexec/xscreensaver/anemotaxis
13libexec/xscreensaver/antinspect 13libexec/xscreensaver/antinspect
14libexec/xscreensaver/antmaze 14libexec/xscreensaver/antmaze
@@ -204,26 +204,27 @@ libexec/xscreensaver/config/pyro.xml @@ -204,26 +204,27 @@ libexec/xscreensaver/config/pyro.xml
204libexec/xscreensaver/config/qix.xml 204libexec/xscreensaver/config/qix.xml
205libexec/xscreensaver/config/queens.xml 205libexec/xscreensaver/config/queens.xml
206libexec/xscreensaver/config/rd-bomb.xml 206libexec/xscreensaver/config/rd-bomb.xml
207libexec/xscreensaver/config/ripples.xml 207libexec/xscreensaver/config/ripples.xml
208libexec/xscreensaver/config/rocks.xml 208libexec/xscreensaver/config/rocks.xml
209libexec/xscreensaver/config/rorschach.xml 209libexec/xscreensaver/config/rorschach.xml
210libexec/xscreensaver/config/rotor.xml 210libexec/xscreensaver/config/rotor.xml
211libexec/xscreensaver/config/rotzoomer.xml 211libexec/xscreensaver/config/rotzoomer.xml
212libexec/xscreensaver/config/rubik.xml 212libexec/xscreensaver/config/rubik.xml
213libexec/xscreensaver/config/sballs.xml 213libexec/xscreensaver/config/sballs.xml
214libexec/xscreensaver/config/shadebobs.xml 214libexec/xscreensaver/config/shadebobs.xml
215libexec/xscreensaver/config/sierpinski.xml 215libexec/xscreensaver/config/sierpinski.xml
216libexec/xscreensaver/config/sierpinski3d.xml 216libexec/xscreensaver/config/sierpinski3d.xml
 217libexec/xscreensaver/config/skytentacles.xml
217libexec/xscreensaver/config/slidescreen.xml 218libexec/xscreensaver/config/slidescreen.xml
218libexec/xscreensaver/config/slip.xml 219libexec/xscreensaver/config/slip.xml
219libexec/xscreensaver/config/sonar.xml 220libexec/xscreensaver/config/sonar.xml
220libexec/xscreensaver/config/speedmine.xml 221libexec/xscreensaver/config/speedmine.xml
221libexec/xscreensaver/config/sphere.xml 222libexec/xscreensaver/config/sphere.xml
222libexec/xscreensaver/config/sphereeversion.xml 223libexec/xscreensaver/config/sphereeversion.xml
223libexec/xscreensaver/config/spheremonics.xml 224libexec/xscreensaver/config/spheremonics.xml
224libexec/xscreensaver/config/spiral.xml 225libexec/xscreensaver/config/spiral.xml
225libexec/xscreensaver/config/spotlight.xml 226libexec/xscreensaver/config/spotlight.xml
226libexec/xscreensaver/config/sproingies.xml 227libexec/xscreensaver/config/sproingies.xml
227libexec/xscreensaver/config/squiral.xml 228libexec/xscreensaver/config/squiral.xml
228libexec/xscreensaver/config/stairs.xml 229libexec/xscreensaver/config/stairs.xml
229libexec/xscreensaver/config/starfish.xml 230libexec/xscreensaver/config/starfish.xml
@@ -390,26 +391,27 @@ libexec/xscreensaver/pyro @@ -390,26 +391,27 @@ libexec/xscreensaver/pyro
390libexec/xscreensaver/qix 391libexec/xscreensaver/qix
391libexec/xscreensaver/queens 392libexec/xscreensaver/queens
392libexec/xscreensaver/rd-bomb 393libexec/xscreensaver/rd-bomb
393libexec/xscreensaver/ripples 394libexec/xscreensaver/ripples
394libexec/xscreensaver/rocks 395libexec/xscreensaver/rocks
395libexec/xscreensaver/rorschach 396libexec/xscreensaver/rorschach
396libexec/xscreensaver/rotor 397libexec/xscreensaver/rotor
397libexec/xscreensaver/rotzoomer 398libexec/xscreensaver/rotzoomer
398libexec/xscreensaver/rubik 399libexec/xscreensaver/rubik
399libexec/xscreensaver/sballs 400libexec/xscreensaver/sballs
400libexec/xscreensaver/shadebobs 401libexec/xscreensaver/shadebobs
401libexec/xscreensaver/sierpinski 402libexec/xscreensaver/sierpinski
402libexec/xscreensaver/sierpinski3d 403libexec/xscreensaver/sierpinski3d
 404libexec/xscreensaver/skytentacles
403libexec/xscreensaver/slidescreen 405libexec/xscreensaver/slidescreen
404libexec/xscreensaver/slip 406libexec/xscreensaver/slip
405libexec/xscreensaver/sonar 407libexec/xscreensaver/sonar
406libexec/xscreensaver/speedmine 408libexec/xscreensaver/speedmine
407libexec/xscreensaver/sphere 409libexec/xscreensaver/sphere
408libexec/xscreensaver/spheremonics 410libexec/xscreensaver/spheremonics
409libexec/xscreensaver/spiral 411libexec/xscreensaver/spiral
410libexec/xscreensaver/spotlight 412libexec/xscreensaver/spotlight
411libexec/xscreensaver/sproingies 413libexec/xscreensaver/sproingies
412libexec/xscreensaver/squiral 414libexec/xscreensaver/squiral
413libexec/xscreensaver/stairs 415libexec/xscreensaver/stairs
414libexec/xscreensaver/starfish 416libexec/xscreensaver/starfish
415libexec/xscreensaver/starwars 417libexec/xscreensaver/starwars
@@ -554,27 +556,27 @@ man/man6/interaggregate.6 @@ -554,27 +556,27 @@ man/man6/interaggregate.6
554man/man6/interference.6 556man/man6/interference.6
555man/man6/intermomentary.6 557man/man6/intermomentary.6
556man/man6/jigglypuff.6 558man/man6/jigglypuff.6
557man/man6/jigsaw.6 559man/man6/jigsaw.6
558man/man6/juggle.6 560man/man6/juggle.6
559man/man6/juggler3d.6 561man/man6/juggler3d.6
560man/man6/julia.6 562man/man6/julia.6
561man/man6/kaleidescope.6 563man/man6/kaleidescope.6
562man/man6/klein.6 564man/man6/klein.6
563man/man6/kumppa.6 565man/man6/kumppa.6
564man/man6/lament.6 566man/man6/lament.6
565man/man6/laser.6 567man/man6/laser.6
566man/man6/lavalite.6 568man/man6/lavalite.6
567man/man6/lcdscrub 569man/man6/lcdscrub.6
568man/man6/lightning.6 570man/man6/lightning.6
569man/man6/lisa.6 571man/man6/lisa.6
570man/man6/lissie.6 572man/man6/lissie.6
571man/man6/ljlatest.6 573man/man6/ljlatest.6
572man/man6/lmorph.6 574man/man6/lmorph.6
573man/man6/lockward.6 575man/man6/lockward.6
574man/man6/loop.6 576man/man6/loop.6
575man/man6/maze.6 577man/man6/maze.6
576man/man6/memscroller.6 578man/man6/memscroller.6
577man/man6/menger.6 579man/man6/menger.6
578man/man6/metaballs.6 580man/man6/metaballs.6
579man/man6/mirrorblob.6 581man/man6/mirrorblob.6
580man/man6/mismunch.6 582man/man6/mismunch.6
@@ -608,26 +610,27 @@ man/man6/pyro.6 @@ -608,26 +610,27 @@ man/man6/pyro.6
608man/man6/qix.6 610man/man6/qix.6
609man/man6/queens.6 611man/man6/queens.6
610man/man6/rd-bomb.6 612man/man6/rd-bomb.6
611man/man6/ripples.6 613man/man6/ripples.6
612man/man6/rocks.6 614man/man6/rocks.6
613man/man6/rorschach.6 615man/man6/rorschach.6
614man/man6/rotor.6 616man/man6/rotor.6
615man/man6/rotzoomer.6 617man/man6/rotzoomer.6
616man/man6/rubik.6 618man/man6/rubik.6
617man/man6/sballs.6 619man/man6/sballs.6
618man/man6/shadebobs.6 620man/man6/shadebobs.6
619man/man6/sierpinski.6 621man/man6/sierpinski.6
620man/man6/sierpinski3d.6 622man/man6/sierpinski3d.6
 623man/man6/skytentacles.6
621man/man6/slidescreen.6 624man/man6/slidescreen.6
622man/man6/slip.6 625man/man6/slip.6
623man/man6/sonar.6 626man/man6/sonar.6
624man/man6/speedmine.6 627man/man6/speedmine.6
625man/man6/sphere.6 628man/man6/sphere.6
626man/man6/spheremonics.6 629man/man6/spheremonics.6
627man/man6/spiral.6 630man/man6/spiral.6
628man/man6/spotlight.6 631man/man6/spotlight.6
629man/man6/sproingies.6 632man/man6/sproingies.6
630man/man6/squiral.6 633man/man6/squiral.6
631man/man6/stairs.6 634man/man6/stairs.6
632man/man6/starfish.6 635man/man6/starfish.6
633man/man6/starwars.6 636man/man6/starwars.6
cvs diff -r1.52 -r1.53 pkgsrc/x11/xscreensaver/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/distinfo 2008/03/10 12:37:12 1.52
+++ pkgsrc/x11/xscreensaver/distinfo 2008/07/30 20:18:36 1.53
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.52 2008/03/10 12:37:12 drochner Exp $ 1$NetBSD: distinfo,v 1.53 2008/07/30 20:18:36 drochner Exp $
2 2
3SHA1 (xscreensaver-5.05.tar.gz) = 6f23422b17dd8a06cdaf419fd16d398eee50601b 3SHA1 (xscreensaver-5.06.tar.gz) = 3310789ecf1ed8ff790d94512fe536857e793e4c
4RMD160 (xscreensaver-5.05.tar.gz) = 8f174d544ae68f54454d946c854cf81749427afb 4RMD160 (xscreensaver-5.06.tar.gz) = de164ee7f68094f77b28dcfaa3279953f98cba83
5Size (xscreensaver-5.05.tar.gz) = 5468293 bytes 5Size (xscreensaver-5.06.tar.gz) = 5486779 bytes
6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 6SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
7SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb 7SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb
8SHA1 (patch-ac) = a18940984f4ebb96bcfb07618ae86aacbdc9cbfb 8SHA1 (patch-ac) = 8ca1464ac1b0748755405977a436e51a2a288329
9SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 9SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 10SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 11SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5 12SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
 13SHA1 (patch-aj) = 053c64a595423a65e9b3bde474ae2e19f3382cf7
cvs diff -r1.19 -r1.20 pkgsrc/x11/xscreensaver/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/patches/Attic/patch-ac 2008/03/10 12:37:12 1.19
+++ pkgsrc/x11/xscreensaver/patches/Attic/patch-ac 2008/07/30 20:18:37 1.20
@@ -1,71 +1,71 @@ @@ -1,71 +1,71 @@
1$NetBSD: patch-ac,v 1.19 2008/03/10 12:37:12 drochner Exp $ 1$NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $
2 2
3--- configure.orig 2008-03-02 06:34:45.000000000 +0100 3--- configure.orig 2008-07-16 23:40:47.000000000 +0200
4+++ configure 4+++ configure
5@@ -3510,6 +3510,9 @@ echo "${ECHO_T}Disabling Objective C ext 5@@ -3500,6 +3500,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp
6 fi 6 ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
7 fi 7 fi
8  8
9+# Disable c89 options, since these trigger more errors than expected and 9+# Disable c89 options, since these trigger more errors than expected and
10+# cause build failures. 10+# cause build failures.
11+if false; then 11+if false; then
12 if test -n "$GCC"; then 12 if test -n "$GCC"; then
13 if test -n "$GCC"; then 13 if test -n "$GCC"; then
14 { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 14 { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5
15@@ -3558,6 +3561,7 @@ echo "${ECHO_T}Disabling C++ comments in 15@@ -3550,6 +3553,7 @@ echo "${ECHO_T}Disabling C++ comments in
16 CC="$CC -Wp,-lang-c89" 16 CC="$CC -Wp,-lang-c89"
17 fi 17 fi
18 fi 18 fi
19+fi 19+fi
20  20
21 ac_ext=c 21 ac_ext=c
22 ac_cpp='$CPP $CPPFLAGS' 22 ac_cpp='$CPP $CPPFLAGS'
23@@ -7929,7 +7933,7 @@ _ACEOF 23@@ -7921,7 +7925,7 @@ _ACEOF
24  24
25  25
26  26
27-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" 27-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW"
28+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl no pl pt ru sk sv vi wa zh_CN zh_TW" 28+ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl no pl pt ru sk sv vi wa zh_CN zh_TW"
29 if test -n "$ac_tool_prefix"; then 29 if test -n "$ac_tool_prefix"; then
30 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 30 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
31 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 31 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
32@@ -13552,7 +13556,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea 32@@ -13640,7 +13644,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
33 echo $ECHO_N "(cached) $ECHO_C" >&6 33 echo $ECHO_N "(cached) $ECHO_C" >&6
34 else 34 else
35 ac_check_lib_save_LIBS=$LIBS 35 ac_check_lib_save_LIBS=$LIBS
36-LIBS="-lkrb4 $LIBS" 36-LIBS="-lkrb4 $LIBS"
37+LIBS="-lkrb -lcrypto -lroken -lcom_err $LIBS" 37+LIBS="-lkrb -lcrypto -lroken -lcom_err $LIBS"
38 cat >conftest.$ac_ext <<_ACEOF 38 cat >conftest.$ac_ext <<_ACEOF
39 /* confdefs.h. */ 39 /* confdefs.h. */
40 _ACEOF 40 _ACEOF
41@@ -13639,7 +13643,7 @@ echo "$as_me: WARNING: Cannot find compa 41@@ -13727,7 +13731,7 @@ echo "$as_me: WARNING: Cannot find compa
42 # from Matt Knopp <mhat@infocalypse.netlag.com> 42 # from Matt Knopp <mhat@infocalypse.netlag.com>
43 # (who got it from amu@mit.edu) 43 # (who got it from amu@mit.edu)
44  44
45- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" 45- PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
46+ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err" 46+ PASSWD_LIBS="$PASSWD_LIBS -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err"
47  47
48 # jwz: MacOS X uses -lkrb5, but not -lcrypt 48 # jwz: MacOS X uses -lkrb5, but not -lcrypt
49  49
50@@ -14801,7 +14805,7 @@ fi 50@@ -14889,7 +14893,7 @@ fi
51 # 51 #
52 if test "$enable_locking" = yes ; then 52 if test "$enable_locking" = yes ; then
53 case "$host" in 53 case "$host" in
54- *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* ) 54- *-hpux* | *-aix* | *-netbsd* | *-freebsd* | *-openbsd* )
55+ *-hpux* | *-aix* | *-freebsd* | *-openbsd* ) 55+ *-hpux* | *-aix* | *-freebsd* | *-openbsd* )
56 need_setuid=yes 56 need_setuid=yes
57 ;; 57 ;;
58 esac 58 esac
59@@ -15235,11 +15239,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > 59@@ -15323,11 +15327,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
60 ac_gtk_config_libs=$ac_cv_gtk_config_libs 60 ac_gtk_config_libs=$ac_cv_gtk_config_libs
61  61
62 GTK_EXTRA_OBJS="" 62 GTK_EXTRA_OBJS=""
63- GTK_DATADIR="" 63- GTK_DATADIR=""
64- if test "$have_gtk" = yes; then 64- if test "$have_gtk" = yes; then
65- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` 65- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
66- GTK_DATADIR="$GTK_DATADIR/share" 66- GTK_DATADIR="$GTK_DATADIR/share"
67- fi 67- fi
68+ GTK_DATADIR="$datadir" 68+ GTK_DATADIR="$datadir"
69  69
70 if test "$have_gtk" = yes; then 70 if test "$have_gtk" = yes; then
71 INCLUDES="$INCLUDES $ac_gtk_config_cflags" 71 INCLUDES="$INCLUDES $ac_gtk_config_cflags"
File Added: pkgsrc/x11/xscreensaver/patches/Attic/patch-aj
$NetBSD: patch-aj,v 1.1 2008/07/30 20:18:37 drochner Exp $

--- hacks/glx/skytentacles.c.orig	2008-07-16 22:19:15.000000000 +0200
+++ hacks/glx/skytentacles.c
@@ -241,6 +241,9 @@ make_tentacle (ModeInfo *mi, int which, 
 
   if (tc->tentacles_size <= tc->ntentacles)
     {
+      if (!tc->tentacles_size)
+	tc->tentacles_size = 10;
+      else
       tc->tentacles_size = (tc->tentacles_size * 1.2) + tc->ntentacles;
       tc->tentacles = (tentacle **)
         realloc (tc->tentacles, tc->tentacles_size * sizeof(*tc->tentacles));