From b6bc732bf84981ea9c0428529757830bf241ead8 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 28 Jun 2005 10:03:14 +0000 Subject: Update to 4.22: Changes since 4.21: * Fixed a bug in the new mouse-motion code that caused the screen to never blank on multi-head non-Xinerama systems. Oops. * New hacks, `interaggregate', `antmaze', `tangram', and `crackberg'. * Minor tweaks to `fiberlamp', `ifs', `slidescreen', `zoom', `sonar', `fireworkx', `whirlwindwarp', `bubble3d', and `rd-bomb'. * Added motion blur to `blinkbox'. * `bsod' now includes Longhorn's "RSOD", and OS/2. * Fixed `-wireframe' usage in most hacks and man pages. --- x11/xscreensaver/Makefile | 3 +-- x11/xscreensaver/Makefile.common | 9 +++++---- x11/xscreensaver/PLIST | 16 +++++++++++++++- x11/xscreensaver/distinfo | 14 +++++++------- x11/xscreensaver/patches/patch-ab | 6 +++--- x11/xscreensaver/patches/patch-ac | 14 +++++++------- x11/xscreensaver/patches/patch-ad | 16 ++++++++-------- 7 files changed, 46 insertions(+), 32 deletions(-) (limited to 'x11/xscreensaver') diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index a762b024835..9dbf456d885 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2005/04/21 15:01:43 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2005/06/28 10:03:14 wiz Exp $ COMMENT= Screen saver and locker for the X window system @@ -7,7 +7,6 @@ CONFLICTS+= xscreensaver-gnome<4.14 CONFLICTS+= barcode-[0-9]* .include "Makefile.common" -PKGREVISION= 1 CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index b82ddfe5807..440a6a4c196 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,7 +1,7 @@ -# $nETbsd: Makefile.common,v 1.75 2004/05/15 13:13:19 wiz Exp $ +# $NetBSD: Makefile.common,v 1.83 2005/06/28 10:03:14 wiz Exp $ # -DISTNAME= xscreensaver-4.21 +DISTNAME= xscreensaver-4.22 CATEGORIES= x11 MASTER_SITES= ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ \ ${HOMEPAGE} @@ -13,10 +13,11 @@ BUILD_USES_MSGFMT= yes BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0.2 USE_PKGLOCALEDIR= yes -USE_X11BASE= yes -USE_PERL5= build +USE_X11= yes +USE_TOOLS+= perl GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --mandir=${PREFIX}/man CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver CONFIGURE_ARGS+= --with-gl CONFIGURE_ARGS+= --with-gle diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 5eef39a9b74..c8696ec0e8f 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2005/04/21 15:01:43 wiz Exp $ +@comment $NetBSD: PLIST,v 1.24 2005/06/28 10:03:14 wiz Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-getimage @@ -11,6 +11,7 @@ libexec/xscreensaver/anemone libexec/xscreensaver/anemotaxis libexec/xscreensaver/ant libexec/xscreensaver/antinspect +libexec/xscreensaver/antmaze libexec/xscreensaver/antspotlight libexec/xscreensaver/apollonian libexec/xscreensaver/apple2 @@ -43,6 +44,7 @@ libexec/xscreensaver/config/anemone.xml libexec/xscreensaver/config/anemotaxis.xml libexec/xscreensaver/config/ant.xml libexec/xscreensaver/config/antinspect.xml +libexec/xscreensaver/config/antmaze.xml libexec/xscreensaver/config/antspotlight.xml libexec/xscreensaver/config/apollonian.xml libexec/xscreensaver/config/apple2.xml @@ -71,6 +73,7 @@ libexec/xscreensaver/config/circuit.xml libexec/xscreensaver/config/cloudlife.xml libexec/xscreensaver/config/compass.xml libexec/xscreensaver/config/coral.xml +libexec/xscreensaver/config/crackberg.xml libexec/xscreensaver/config/critical.xml libexec/xscreensaver/config/crystal.xml libexec/xscreensaver/config/cubenetic.xml @@ -129,6 +132,7 @@ libexec/xscreensaver/config/hypercube.xml libexec/xscreensaver/config/hypertorus.xml libexec/xscreensaver/config/ifs.xml libexec/xscreensaver/config/imsmap.xml +libexec/xscreensaver/config/interaggregate.xml libexec/xscreensaver/config/interference.xml libexec/xscreensaver/config/intermomentary.xml libexec/xscreensaver/config/jigglypuff.xml @@ -211,6 +215,7 @@ libexec/xscreensaver/config/substrate.xml libexec/xscreensaver/config/superquadrics.xml libexec/xscreensaver/config/swirl.xml libexec/xscreensaver/config/t3d.xml +libexec/xscreensaver/config/tangram.xml libexec/xscreensaver/config/thornbird.xml libexec/xscreensaver/config/triangle.xml libexec/xscreensaver/config/truchet.xml @@ -234,6 +239,7 @@ libexec/xscreensaver/config/xspirograph.xml libexec/xscreensaver/config/xteevee.xml libexec/xscreensaver/config/zoom.xml libexec/xscreensaver/coral +libexec/xscreensaver/crackberg libexec/xscreensaver/critical libexec/xscreensaver/crystal libexec/xscreensaver/cubenetic @@ -292,6 +298,7 @@ libexec/xscreensaver/hypercube libexec/xscreensaver/hypertorus libexec/xscreensaver/ifs libexec/xscreensaver/imsmap +libexec/xscreensaver/interaggregate libexec/xscreensaver/interference libexec/xscreensaver/intermomentary libexec/xscreensaver/jigglypuff @@ -375,6 +382,7 @@ libexec/xscreensaver/substrate libexec/xscreensaver/superquadrics libexec/xscreensaver/swirl libexec/xscreensaver/t3d +libexec/xscreensaver/tangram libexec/xscreensaver/thornbird libexec/xscreensaver/triangle libexec/xscreensaver/truchet @@ -402,6 +410,7 @@ man/man1/anemone.1 man/man1/anemotaxis.1 man/man1/ant.1 man/man1/antinspect.1 +man/man1/antmaze.1 man/man1/antspotlight.1 man/man1/apollonian.1 man/man1/apple2.1 @@ -430,6 +439,7 @@ man/man1/circuit.1 man/man1/cloudlife.1 man/man1/compass.1 man/man1/coral.1 +man/man1/crackberg.1 man/man1/critical.1 man/man1/crystal.1 man/man1/cubenetic.1 @@ -488,6 +498,7 @@ man/man1/hypercube.1 man/man1/hypertorus.1 man/man1/ifs.1 man/man1/imsmap.1 +man/man1/interaggregate.1 man/man1/interference.1 man/man1/intermomentary.1 man/man1/jigglypuff.1 @@ -570,6 +581,7 @@ man/man1/substrate.1 man/man1/superquadrics.1 man/man1/swirl.1 man/man1/t3d.1 +man/man1/tangram.1 man/man1/thornbird.1 man/man1/triangle.1 man/man1/truchet.1 @@ -607,8 +619,10 @@ ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xscreensaver.mo diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 5bb123d9036..2d843b1cc7f 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.42 2005/04/21 15:01:43 wiz Exp $ +$NetBSD: distinfo,v 1.43 2005/06/28 10:03:14 wiz Exp $ -SHA1 (xscreensaver-4.21.tar.gz) = 2f6aa051a2f9e9f041133c0a60746e830228f09b -RMD160 (xscreensaver-4.21.tar.gz) = ae31d5e57ce9e2eece3dfba424af9ebab2c12993 -Size (xscreensaver-4.21.tar.gz) = 4519828 bytes +SHA1 (xscreensaver-4.22.tar.gz) = f40db41ef221f7ed42c39e77007ce05b4f846306 +RMD160 (xscreensaver-4.22.tar.gz) = bf93e368d5e6f98ba383a908708a59f1a428aece +Size (xscreensaver-4.22.tar.gz) = 4620066 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 -SHA1 (patch-ab) = b67eccd08776b212935959447a27662da1e54ae3 -SHA1 (patch-ac) = e4711dc13810555071150268eb26b848f8eb1987 -SHA1 (patch-ad) = 3c8a393d1198ef47c664ab831744f1d0ab03e0cf +SHA1 (patch-ab) = 4de956f7911ccf31f16bff41339e2678ccac1129 +SHA1 (patch-ac) = fa811462fd59c16d25f89616665e0577431328b9 +SHA1 (patch-ad) = c524e17ffe6752bff48d20c6cc9670e8005be42d SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab index bc0056ac50f..75e4c3f1aea 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.14 2005/03/24 13:55:42 wiz Exp $ +$NetBSD: patch-ab,v 1.15 2005/06/28 10:03:14 wiz Exp $ ---- configure.in.orig 2005-03-21 07:43:24.000000000 +0100 +--- configure.in.orig 2005-06-04 21:50:54.000000000 +0200 +++ configure.in -@@ -1663,7 +1663,7 @@ if test "$enable_locking" = yes -a "$wit +@@ -1950,7 +1950,7 @@ if test "$enable_locking" = yes -a "$wit # from Matt Knopp # (who got it from amu@mit.edu) diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 53a12dd70e5..27c809ecd90 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ +$NetBSD: patch-ac,v 1.15 2005/06/28 10:03:14 wiz Exp $ ---- configure.orig 2005-03-21 08:18:18.000000000 +0100 +--- configure.orig 2005-06-23 03:02:21.000000000 +0200 +++ configure -@@ -2686,6 +2686,9 @@ echo "${ECHO_T}Turning on SGI compiler w +@@ -2856,6 +2856,9 @@ echo "${ECHO_T}Turning on SGI compiler w esac fi @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ if test -n "$GCC"; then if test -n "$GCC"; then echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5 -@@ -2732,6 +2735,7 @@ echo "${ECHO_T}Disabling C++ comments in +@@ -2902,6 +2905,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ if test -n "$GCC"; then if test -n "$GCC"; then -@@ -12786,7 +12790,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -12972,7 +12976,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 @@ $NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -12876,7 +12880,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -13062,7 +13066,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp # (who got it from amu@mit.edu) @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -14513,11 +14517,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > +@@ -14699,11 +14703,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > ac_gtk_config_libs=$ac_cv_gtk_config_libs GTK_EXTRA_OBJS="" diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad index b579fa8966e..616d7faa2d6 100644 --- a/x11/xscreensaver/patches/patch-ad +++ b/x11/xscreensaver/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ +$NetBSD: patch-ad,v 1.17 2005/06/28 10:03:14 wiz Exp $ ---- driver/Makefile.in.orig 2005-03-21 16:18:18.000000000 +0900 -+++ driver/Makefile.in 2005-04-20 17:28:14.000000000 +0900 -@@ -222,7 +222,7 @@ +--- driver/Makefile.in.orig 2005-06-23 03:02:23.000000000 +0200 ++++ driver/Makefile.in +@@ -222,7 +222,7 @@ HDRS = XScreenSaver_ad.h XScreenSaver_X xscreensaver.h prefs.h remote.h \ demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \ demo-Gtk-conf.h @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ xscreensaver-command.man \ xscreensaver-text.man \ xscreensaver-getimage.man \ -@@ -288,7 +288,7 @@ +@@ -288,7 +288,7 @@ install-program: $(EXES) fi ; \ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ xscreensaver-getimage @EXES_OSX@ ; do \ echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ -@@ -464,7 +464,7 @@ +@@ -482,7 +482,7 @@ install-pam: # screensaver-properties.desktop # into /usr/share/applications/ @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ @if [ "$(GTK_DATADIR)" != "" ]; then \ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ -@@ -496,7 +496,7 @@ +@@ -514,7 +514,7 @@ install-gnome:: $(LOGO) # ../utils/images/screensaver-*.png # into /usr/share/xscreensaver/glade/ install-gnome:: @@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ -@@ -513,7 +513,7 @@ +@@ -531,7 +531,7 @@ install-gnome:: # xscreensaver-demo.glade2 # into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 -- cgit v1.2.3