[pkgsrc/trunk]: pkgsrc/x11 Update to 4.15:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/901a980847f9
branches:  trunk
changeset: 475187:901a980847f9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 11 13:34:20 2004 +0000

description:
Update to 4.15:
* New hacks, `wormhole', `mismunch', `noof', and
  `pacman'.
* `phosphor' and `apple2' include vt100 emulators now:
  this means you can do "phosphor -program top", or
  can use either program as an xterm replacement:
  "apple2 -text -fast -program 'xemacs -nw'".
* `analogtv' (and related) fill the screen better.
* The '-gradient' option works in `atlantis' now.
* Minor updates to `blinkbox', `queens', `endgame',
  `glmatrix', `mirrorblob', `blocktube', and `molecule'.
* Integrated SuSE's "external passwd helper" support.
* Marginally better /tmp handling in various programs.
* Updated config defaults for xplanet 1.0.3.
* Portability fixes.

diffstat:

 x11/xscreensaver-demo/Makefile    |   3 +--
 x11/xscreensaver-gnome/Makefile   |   3 +--
 x11/xscreensaver/Makefile         |   3 +--
 x11/xscreensaver/Makefile.common  |   4 ++--
 x11/xscreensaver/PLIST            |  15 ++++++++++++++-
 x11/xscreensaver/distinfo         |  13 ++++++-------
 x11/xscreensaver/patches/patch-ab |   8 ++++----
 x11/xscreensaver/patches/patch-ac |  14 +++++++-------
 x11/xscreensaver/patches/patch-ad |  16 ++++++++--------
 x11/xscreensaver/patches/patch-ah |  12 ------------
 10 files changed, 44 insertions(+), 47 deletions(-)

diffs (truncated from 313 to 300 lines):

diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile    Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver-demo/Makefile    Tue May 11 13:34:20 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/04/14 19:30:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/11 13:34:20 wiz Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-demo-/}
 COMMENT=       Screen saver and locker for the X window system (demo program)
-PKGREVISION=   4
 
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-gnome-[0-9]*
 
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver-gnome/Makefile
--- a/x11/xscreensaver-gnome/Makefile   Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver-gnome/Makefile   Tue May 11 13:34:20 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2004/04/14 19:30:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/05/11 13:34:20 wiz Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
 COMMENT=       Screen saver and locker for the X window system (GNOME applet)
-PKGREVISION=   4
 
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-demo-[0-9]*
 
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/Makefile Tue May 11 13:34:20 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2004/02/01 10:48:46 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2004/05/11 13:34:20 wiz Exp $
 
 COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   2
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/Makefile.common  Tue May 11 13:34:20 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.73 2004/03/17 19:36:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.74 2004/05/11 13:34:20 wiz Exp $
 #
 
-DISTNAME=              xscreensaver-4.14
+DISTNAME=              xscreensaver-4.15
 CATEGORIES=            x11
 MASTER_SITES=          ${HOMEPAGE} \
                        ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/PLIST    Tue May 11 13:34:20 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2004/02/02 23:56:03 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.19 2004/05/11 13:34:20 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -139,6 +139,7 @@
 libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
 libexec/xscreensaver/config/mirrorblob.xml
+libexec/xscreensaver/config/mismunch.xml
 libexec/xscreensaver/config/moebius.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
@@ -147,7 +148,9 @@
 libexec/xscreensaver/config/mountain.xml
 libexec/xscreensaver/config/munch.xml
 libexec/xscreensaver/config/nerverot.xml
+libexec/xscreensaver/config/noof.xml
 libexec/xscreensaver/config/noseguy.xml
+libexec/xscreensaver/config/pacman.xml
 libexec/xscreensaver/config/pedal.xml
 libexec/xscreensaver/config/penetrate.xml
 libexec/xscreensaver/config/penrose.xml
@@ -206,6 +209,7 @@
 libexec/xscreensaver/config/whirlwindwarp.xml
 libexec/xscreensaver/config/whirlygig.xml
 libexec/xscreensaver/config/worm.xml
+libexec/xscreensaver/config/wormhole.xml
 libexec/xscreensaver/config/xanalogtv.xml
 libexec/xscreensaver/config/xaos.xml
 libexec/xscreensaver/config/xdaliclock.xml
@@ -216,6 +220,7 @@
 libexec/xscreensaver/config/xlyap.xml
 libexec/xscreensaver/config/xmatrix.xml
 libexec/xscreensaver/config/xmountains.xml
+libexec/xscreensaver/config/xplanet.xml
 libexec/xscreensaver/config/xrayswarm.xml
 libexec/xscreensaver/config/xsnow.xml
 libexec/xscreensaver/config/xspirograph.xml
@@ -297,6 +302,7 @@
 libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
 libexec/xscreensaver/mirrorblob
+libexec/xscreensaver/mismunch
 libexec/xscreensaver/moebius
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
@@ -305,7 +311,9 @@
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
 libexec/xscreensaver/nerverot
+libexec/xscreensaver/noof
 libexec/xscreensaver/noseguy
+libexec/xscreensaver/pacman
 libexec/xscreensaver/pedal
 libexec/xscreensaver/penetrate
 libexec/xscreensaver/penrose
@@ -362,6 +370,7 @@
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/whirlygig
 libexec/xscreensaver/worm
+libexec/xscreensaver/wormhole
 libexec/xscreensaver/xanalogtv
 libexec/xscreensaver/xflame
 libexec/xscreensaver/xjack
@@ -474,6 +483,7 @@
 man/man1/menger.1
 man/man1/metaballs.1
 man/man1/mirrorblob.1
+man/man1/mismunch.1
 man/man1/moebius.1
 man/man1/moire.1
 man/man1/moire2.1
@@ -482,7 +492,9 @@
 man/man1/mountain.1
 man/man1/munch.1
 man/man1/nerverot.1
+man/man1/noof.1
 man/man1/noseguy.1
+man/man1/pacman.1
 man/man1/pedal.1
 man/man1/penetrate.1
 man/man1/penrose.1
@@ -538,6 +550,7 @@
 man/man1/whirlwindwarp.1
 man/man1/whirlygig.1
 man/man1/worm.1
+man/man1/wormhole.1
 man/man1/xanalogtv.1
 man/man1/xflame.1
 man/man1/xjack.1
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/distinfo Tue May 11 13:34:20 2004 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.35 2004/02/26 16:42:39 jmmv Exp $
+$NetBSD: distinfo,v 1.36 2004/05/11 13:34:20 wiz Exp $
 
-SHA1 (xscreensaver-4.14.tar.gz) = 4996718deaceeb578953f400e518b745c1dd32c4
-Size (xscreensaver-4.14.tar.gz) = 3988251 bytes
+SHA1 (xscreensaver-4.15.tar.gz) = 3ce8f7d8a2f490daaa3a0943491a589f1a635529
+Size (xscreensaver-4.15.tar.gz) = 4045811 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
-SHA1 (patch-ab) = 3dc02761edb19658e17935bd245208fa7387316d
-SHA1 (patch-ac) = 84f30ee9e0c96e239e3747a2f1afcca31db58c52
-SHA1 (patch-ad) = 244908c3e4c278c878bf89e07bd68efb62b3fc4d
+SHA1 (patch-ab) = 9afb731b9f946517f061bc0c3bc147867f2db06b
+SHA1 (patch-ac) = 504d0773269d2a5fee5ed995a003d8339b8526e7
+SHA1 (patch-ad) = 990853ab6c83c173df9139aad43caa29193d349c
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
-SHA1 (patch-ah) = ad69453d8e27f25da9fa9fedc4dd68afc460b2b5
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/patches/patch-ab
--- a/x11/xscreensaver/patches/patch-ab Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/patches/patch-ab Tue May 11 13:34:20 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2003/02/21 22:05:02 mycroft Exp $
+$NetBSD: patch-ab,v 1.12 2004/05/11 13:34:20 wiz Exp $
 
---- configure.in.orig  2003-02-12 23:27:30.000000000 +0000
-+++ configure.in       2003-02-21 21:42:53.000000000 +0000
-@@ -1579,7 +1579,7 @@
+--- configure.in.orig  2004-02-20 23:58:44.000000000 +0100
++++ configure.in
+@@ -1661,7 +1661,7 @@ if test "$enable_locking" = yes -a "$wit
      # from Matt Knopp <mhat%infocalypse.netlag.com@localhost>
      # (who got it from amu%mit.edu@localhost)
  
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/patches/patch-ac
--- a/x11/xscreensaver/patches/patch-ac Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/patches/patch-ac Tue May 11 13:34:20 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2004/02/26 16:42:39 jmmv Exp $
+$NetBSD: patch-ac,v 1.12 2004/05/11 13:34:20 wiz Exp $
 
---- configure.orig     2003-10-25 09:47:18.000000000 +0200
+--- configure.orig     2004-02-27 02:37:55.000000000 +0100
 +++ configure
-@@ -2592,6 +2592,9 @@ echo "${ECHO_T}Turning on SGI compiler w
+@@ -2594,6 +2594,9 @@ echo "${ECHO_T}Turning on SGI compiler w
      esac
    fi
  
@@ -12,7 +12,7 @@
  if test -n "$GCC"; then
     if test -n "$GCC"; then
     echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5
-@@ -2638,6 +2641,7 @@ echo "${ECHO_T}Disabling C++ comments in
+@@ -2640,6 +2643,7 @@ echo "${ECHO_T}Disabling C++ comments in
       CC="$CC -Wp,-lang-c89"
     fi
    fi
@@ -20,7 +20,7 @@
  
  if test -n "$GCC"; then
     if test -n "$GCC"; then
-@@ -11657,7 +11661,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+@@ -11780,7 +11784,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -29,7 +29,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -11737,7 +11741,7 @@ echo "$as_me: WARNING: Cannot find compa
+@@ -11860,7 +11864,7 @@ echo "$as_me: WARNING: Cannot find compa
      # from Matt Knopp <mhat%infocalypse.netlag.com@localhost>
      # (who got it from amu%mit.edu@localhost)
  
@@ -38,7 +38,7 @@
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -13739,19 +13743,7 @@ fi
+@@ -13907,19 +13911,7 @@ fi
    fi
  
  
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/patches/patch-ad
--- a/x11/xscreensaver/patches/patch-ad Tue May 11 13:12:01 2004 +0000
+++ b/x11/xscreensaver/patches/patch-ad Tue May 11 13:34:20 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2003/12/13 19:22:13 jmmv Exp $
+$NetBSD: patch-ad,v 1.12 2004/05/11 13:34:20 wiz Exp $
 
---- driver/Makefile.in.orig    2003-10-25 09:47:19.000000000 +0200
+--- driver/Makefile.in.orig    2004-02-27 02:37:56.000000000 +0100
 +++ driver/Makefile.in
-@@ -287,7 +287,7 @@ install-program: $(EXES)
+@@ -290,7 +290,7 @@ install-program: $(EXES)
        fi ;                                                                  \
        echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
        $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@@ -11,7 +11,7 @@
                    xscreensaver-getimage @EXES_OSX@ ; do                  \
          echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
               $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -462,7 +462,7 @@ install-pam:
+@@ -465,7 +465,7 @@ install-pam:
          fi ;                                                          \
        fi
  
@@ -20,7 +20,7 @@
        @lost=""                                                             ;\
           if [ "$(GNOME_DATADIR)" != "" ]; then                                \
                                                                              \
-@@ -470,10 +470,6 @@ install-gnome:: screensaver-properties.d
+@@ -473,10 +473,6 @@ install-gnome:: screensaver-properties.d
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
             fi                                                                ;\
@@ -31,7 +31,7 @@
             if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then              \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
                    $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)"        ;\
-@@ -494,16 +490,6 @@ install-gnome:: screensaver-properties.d
+@@ -497,16 +493,6 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
                                                                              \
             echo $(INSTALL_DATA) screensaver-properties.desktop                      \
@@ -48,7 +48,7 @@
               $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\
                                                                              \
             if   $(INSTALL_DATA) screensaver-properties.desktop                      \
-@@ -537,7 +523,7 @@ install-gnome:: screensaver-properties.d
+@@ -540,7 +526,7 @@ install-gnome:: screensaver-properties.d
             fi                                                                ;\
           fi
  
@@ -57,7 +57,7 @@
        @if [ "$(GNOME_DATADIR)" != "" ]; then                                \
             if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then               \
               echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
-@@ -636,8 +622,6 @@ uninstall-gnome::
+@@ -639,8 +625,6 @@ uninstall-gnome::
            f=screensaver-properties.desktop                                   ;\
            echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
                 rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f                   ;\
diff -r 79c807404631 -r 901a980847f9 x11/xscreensaver/patches/patch-ah
--- a/x11/xscreensaver/patches/patch-ah Tue May 11 13:12:01 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000