pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Update to 4.21:
details: https://anonhg.NetBSD.org/pkgsrc/rev/20f7c8f36ecc
branches: trunk
changeset: 491454:20f7c8f36ecc
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Mar 24 13:55:42 2005 +0000
description:
Update to 4.21:
Changes since 4.20: * New hack: `fliptext'.
* Changed default configure installation directories:
/usr/bin/ for xscreensaver, etc.;
/usr/libexec/xscreensaver/ for hacks;
/usr/share/xscreensaver/config/ for xml files.
* All the text-manipulating screen savers can have their
text source configured via `xscreensaver-demo' now.
* xscreensaver.spec now builds three RPMs:
base (no hacks); extras (2d hacks); and gl-extras.
* Added `-program' and `-front' option to `gltext'.
* Added `-shells' to `molecule'.
* Fixed text-alpha glitch in `carousel'.
* New `pacman': the ghosts can be killed now.
* Fixed a bug in screen-grabbing GL hacks where images
would be tiled instead of scaled on machines that
can't do large textures.
* `webcollage' can hit Flickr now.
* New (rewritten) implementation of `ifs'.
* The unlock dialog can be made to have a "New Login"
button that will run `gdmflexiserver'. Experimental!
* Fixed non-ASCII display bug in `starwars'.
* Configure finds a default for imageDirectory.
* "xscreensaver-command -lock" now works even if
in "screensaver disabled" mode.
* If a bad password is typed while CapsLock is on, the
unlock dialog says "CapsLock?" instead of "Sorry".
* Mouse motion only counts as activity if the mouse moved
more than 10 pixels (so the screen won't unblank every
time you bump your desk.)
* New mode option "random-same": if you have multiple
monitors, this will run the *same* randomly chosen
hack on each screen, instead of different ones on each.
Changes since 4.19: * New hacks, `fiberlamp', `boing', `boxfit', and
`carousel'.
* Rewrote `glslideshow' again: should be faster now.
* Sped up loading of images in GL programs.
* `starwars' uses texture-mapped fonts now.
* New `bsod' modes: tru64, hppa, and nvidia.
* Updates to `webcollage', `juggle', `pinion',
`fireworkx', `sonar', `extrusion', `substrate', and
`pong'.
Changes since 4.18: * New hacks, `substrate', `intermomentary', `fireworkx',
and `pinion'.
* New version of `flow'.
* Made /proc/interrupts work again on Linux 2.6.
* Made `analogtv' not hog the CPU.
* Made analogtv-based hacks work properly on PPC/ARM.
* Fixed a bad memory leak in `piecewise'.
* Minor updates to `sonar', `molecule', `glmatrix',
`galaxy', and `webcollage'.
* Removed support for GTK 1.x (everyone uses 2.x now.)
diffstat:
x11/xscreensaver-demo/Makefile | 4 +-
x11/xscreensaver-demo/PLIST | 17 +++++----
x11/xscreensaver-gnome/DESCR | 14 --------
x11/xscreensaver-gnome/Makefile | 45 ---------------------------
x11/xscreensaver-gnome/PLIST | 20 ------------
x11/xscreensaver/Makefile | 2 +-
x11/xscreensaver/Makefile.common | 12 +------
x11/xscreensaver/PLIST | 50 ++++++++++++++++++++----------
x11/xscreensaver/distinfo | 14 ++++----
x11/xscreensaver/patches/patch-ab | 6 +-
x11/xscreensaver/patches/patch-ac | 38 +++++++++--------------
x11/xscreensaver/patches/patch-ad | 64 +++++---------------------------------
12 files changed, 80 insertions(+), 206 deletions(-)
diffs (truncated from 637 to 300 lines):
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile Thu Mar 24 11:34:35 2005 +0000
+++ b/x11/xscreensaver-demo/Makefile Thu Mar 24 13:55:42 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:18:40 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/24 13:55:42 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
-PKGREVISION= 1
COMMENT= Demo viewer and configuration tool for xscreensaver
CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*
@@ -12,7 +11,6 @@
.include "../../x11/xscreensaver/Makefile.common"
-CONFIGURE_ARGS+= --without-gnome
CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver-demo/PLIST
--- a/x11/xscreensaver-demo/PLIST Thu Mar 24 11:34:35 2005 +0000
+++ b/x11/xscreensaver-demo/PLIST Thu Mar 24 13:55:42 2005 +0000
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/13 19:23:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/03/24 13:55:42 wiz Exp $
bin/xscreensaver-demo
share/pixmaps/xscreensaver.xpm
-share/xscreensaver/screensaver-cmndln.png
-share/xscreensaver/screensaver-colorselector.png
-share/xscreensaver/screensaver-diagnostic.png
-share/xscreensaver/screensaver-locking.png
-share/xscreensaver/screensaver-power.png
-share/xscreensaver/screensaver-snap.png
-share/xscreensaver/xscreensaver-demo.glade2
+share/xscreensaver/glade/screensaver-cmndln.png
+share/xscreensaver/glade/screensaver-colorselector.png
+share/xscreensaver/glade/screensaver-diagnostic.png
+share/xscreensaver/glade/screensaver-locking.png
+share/xscreensaver/glade/screensaver-power.png
+share/xscreensaver/glade/screensaver-snap.png
+share/xscreensaver/glade/xscreensaver-demo.glade2
+@dirrm share/xscreensaver/glade
@dirrm share/xscreensaver
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver-gnome/DESCR
--- a/x11/xscreensaver-gnome/DESCR Thu Mar 24 11:34:35 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-The xscreensaver program waits until the keyboard and mouse have been idle
-for a period, and then runs a graphics demo chosen at random. It turns off
-as soon as there is any mouse or keyboard activity.
-
-The purpose of xscreensaver is to display pretty pictures on your screen
-when it is not in use, in keeping with the philosophy that unattended
-monitors should always be doing something interesting, just like they do
-in the movies.
-
-However, xscreensaver can also be used as a screen locker, to prevent
-others from using your terminal while your are away.
-
-This package provies xscreensaver-gnome linked against gnome-libs, required
-to get GNOME 1.4 support.
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver-gnome/Makefile
--- a/x11/xscreensaver-gnome/Makefile Thu Mar 24 11:34:35 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2004/11/30 18:26:41 wiz Exp $
-#
-
-PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 2
-COMMENT= Screen saver and locker for the X window system (GNOME applet)
-
-CONFLICTS+= xscreensaver<4.14 xscreensaver-demo-[0-9]*
-
-USE_BUILDLINK3= yes
-USE_DIRS+= xdg-1.1
-
-.include "../../x11/xscreensaver/Makefile.common"
-
-# so that the screensaver.desktop rule in ``configure'' works
-USE_GNU_TOOLS+= make
-
-CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk}
-CONFIGURE_ARGS+= --with-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf}
-CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
-CONFIGURE_ARGS+= --with-gnome=${BUILDLINK_PREFIX.gnome-libs}
-CONFIGURE_ARGS+= --with-configdir=${PREFIX}/share/control-center/screensavers
-
-BUILD_DIRS= ${WRKSRC}/utils ${WRKSRC}/driver
-INSTALL_DIRS= ${WRKSRC}/driver
-INSTALL_TARGET= install-gnome xxxinstall-gnome
-
-# Very ugly hack so that GTK2 is not found, since the package does not support
-# choosing GTK1 over GTK2 (which is needed, since gnome-libs link against GTK1).
-pre-configure:
- cd ${WRKSRC} && ${SED} -e "s/have_gtk2=yes/have_gtk=no/g" \
- -e "s/HAVE_GTK2/DUMMY_HAVE_GTK2/g" configure \
- > configure.patched && \
- ${MV} configure.patched configure && ${CHMOD} 755 configure
-
-post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
- ${LN} -s ${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver/config \
- ${PREFIX}/share/control-center/screensavers
-
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/controlcenter/buildlink3.mk"
-.include "../../x11/xscreensaver/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver-gnome/PLIST
--- a/x11/xscreensaver-gnome/PLIST Thu Mar 24 11:34:35 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.17 2003/12/13 19:22:13 jmmv Exp $
-bin/screensaver-properties-capplet
-bin/xscreensaver-demo
-share/control-center-2.0/capplets/screensaver-properties.desktop
-share/control-center/Desktop/screensaver-properties.desktop
-share/control-center/screensavers
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-share/pixmaps/xscreensaver.xpm
-share/xscreensaver/screensaver-cmndln.png
-share/xscreensaver/screensaver-colorselector.png
-share/xscreensaver/screensaver-diagnostic.png
-share/xscreensaver/screensaver-locking.png
-share/xscreensaver/screensaver-power.png
-share/xscreensaver/screensaver-snap.png
-share/xscreensaver/xscreensaver-demo.glade2
-@dirrm share/xscreensaver
-@comment in gnome-dirs: @dirrm share/gnome/apps/Settings/Desktop
-@comment in controlcenter: @dirrm share/control-center/Desktop
-@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
-@comment in gnome2-dirs: @dirrm share/control-center
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Thu Mar 24 11:34:35 2005 +0000
+++ b/x11/xscreensaver/Makefile Thu Mar 24 13:55:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/03/18 14:44:58 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/03/24 13:55:42 wiz Exp $
COMMENT= Screen saver and locker for the X window system
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common Thu Mar 24 11:34:35 2005 +0000
+++ b/x11/xscreensaver/Makefile.common Thu Mar 24 13:55:42 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.78 2005/03/21 12:33:26 wiz Exp $
+# $nETbsd: Makefile.common,v 1.75 2004/05/15 13:13:19 wiz Exp $
#
-DISTNAME= xscreensaver-4.18
+DISTNAME= xscreensaver-4.21
CATEGORIES= x11
MASTER_SITES= ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/ \
${HOMEPAGE}
@@ -34,7 +34,6 @@
CONFIGURE_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
.endif
CONFIGURE_ARGS+= ac_cv_path_INTLTOOL_PERL="${PERL5}"
-MAKE_ENV+= KDEDIR=${PREFIX}
DISTINFO_FILE= ${.CURDIR}/../../x11/xscreensaver/distinfo
FILESDIR= ${.CURDIR}/../../x11/xscreensaver/files
@@ -42,13 +41,6 @@
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+= AVAILABLE="@comment "
-CONFIGURE_ARGS+= --without-kerberos
-.else
-PLIST_SUBST+= AVAILABLE=
-.endif
-
.ifndef (PERL_VERSION)
PERL_VERSION!= if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi
MAKEFLAGS+= PERL_VERSION=${PERL_VERSION}
diff -r e1c4c775534b -r 20f7c8f36ecc x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST Thu Mar 24 11:34:35 2005 +0000
+++ b/x11/xscreensaver/PLIST Thu Mar 24 13:55:42 2005 +0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.21 2004/09/27 14:19:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2005/03/24 13:55:42 wiz Exp $
bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-getimage
bin/xscreensaver-getimage-file
bin/xscreensaver-getimage-video
bin/xscreensaver-gl-helper
-bin/xscreensaver.kss
+bin/xscreensaver-text
lib/X11/app-defaults/XScreenSaver
libexec/xscreensaver/anemone
libexec/xscreensaver/anemotaxis
@@ -22,15 +22,18 @@
libexec/xscreensaver/blinkbox
libexec/xscreensaver/blitspin
libexec/xscreensaver/blocktube
+libexec/xscreensaver/boing
libexec/xscreensaver/bouboule
libexec/xscreensaver/bouncingcow
libexec/xscreensaver/boxed
+libexec/xscreensaver/boxfit
libexec/xscreensaver/braid
libexec/xscreensaver/bsod
libexec/xscreensaver/bubble3d
libexec/xscreensaver/bubbles
libexec/xscreensaver/bumps
libexec/xscreensaver/cage
+libexec/xscreensaver/carousel
libexec/xscreensaver/ccurve
libexec/xscreensaver/circuit
libexec/xscreensaver/cloudlife
@@ -51,21 +54,23 @@
libexec/xscreensaver/config/blinkbox.xml
libexec/xscreensaver/config/blitspin.xml
libexec/xscreensaver/config/blocktube.xml
+libexec/xscreensaver/config/boing.xml
libexec/xscreensaver/config/bouboule.xml
libexec/xscreensaver/config/bouncingcow.xml
libexec/xscreensaver/config/boxed.xml
+libexec/xscreensaver/config/boxfit.xml
libexec/xscreensaver/config/braid.xml
libexec/xscreensaver/config/bsod.xml
libexec/xscreensaver/config/bubble3d.xml
libexec/xscreensaver/config/bubbles.xml
libexec/xscreensaver/config/bumps.xml
libexec/xscreensaver/config/cage.xml
+libexec/xscreensaver/config/carousel.xml
libexec/xscreensaver/config/ccurve.xml
libexec/xscreensaver/config/circuit.xml
libexec/xscreensaver/config/cloudlife.xml
libexec/xscreensaver/config/compass.xml
libexec/xscreensaver/config/coral.xml
-libexec/xscreensaver/config/cosmos.xml
libexec/xscreensaver/config/critical.xml
libexec/xscreensaver/config/crystal.xml
libexec/xscreensaver/config/cubenetic.xml
@@ -79,7 +84,6 @@
libexec/xscreensaver/config/discrete.xml
libexec/xscreensaver/config/distort.xml
libexec/xscreensaver/config/drift.xml
-libexec/xscreensaver/config/electricsheep.xml
libexec/xscreensaver/config/endgame.xml
libexec/xscreensaver/config/engine.xml
libexec/xscreensaver/config/epicycle.xml
@@ -87,11 +91,13 @@
libexec/xscreensaver/config/euler2d.xml
libexec/xscreensaver/config/extrusion.xml
libexec/xscreensaver/config/fadeplot.xml
-libexec/xscreensaver/config/fireflies.xml
+libexec/xscreensaver/config/fiberlamp.xml
+libexec/xscreensaver/config/fireworkx.xml
libexec/xscreensaver/config/flag.xml
libexec/xscreensaver/config/flame.xml
libexec/xscreensaver/config/flipflop.xml
libexec/xscreensaver/config/flipscreen3d.xml
+libexec/xscreensaver/config/fliptext.xml
libexec/xscreensaver/config/flow.xml
libexec/xscreensaver/config/fluidballs.xml
libexec/xscreensaver/config/flurry.xml
@@ -111,7 +117,6 @@
libexec/xscreensaver/config/glslideshow.xml
libexec/xscreensaver/config/glsnake.xml
libexec/xscreensaver/config/gltext.xml
-libexec/xscreensaver/config/goban.xml
libexec/xscreensaver/config/goop.xml
libexec/xscreensaver/config/grav.xml
libexec/xscreensaver/config/greynetic.xml
@@ -125,6 +130,7 @@
libexec/xscreensaver/config/ifs.xml
libexec/xscreensaver/config/imsmap.xml
libexec/xscreensaver/config/interference.xml
+libexec/xscreensaver/config/intermomentary.xml
libexec/xscreensaver/config/jigglypuff.xml
libexec/xscreensaver/config/jigsaw.xml
libexec/xscreensaver/config/juggle.xml
@@ -163,6 +169,7 @@
libexec/xscreensaver/config/petri.xml
libexec/xscreensaver/config/phosphor.xml
libexec/xscreensaver/config/piecewise.xml
+libexec/xscreensaver/config/pinion.xml
libexec/xscreensaver/config/pipes.xml
libexec/xscreensaver/config/polyhedra.xml
libexec/xscreensaver/config/polyominoes.xml
@@ -190,18 +197,17 @@
libexec/xscreensaver/config/sonar.xml
libexec/xscreensaver/config/speedmine.xml
libexec/xscreensaver/config/sphere.xml
-libexec/xscreensaver/config/sphereeversion.xml
libexec/xscreensaver/config/spheremonics.xml
libexec/xscreensaver/config/spiral.xml
libexec/xscreensaver/config/spotlight.xml
libexec/xscreensaver/config/sproingies.xml
libexec/xscreensaver/config/squiral.xml
-libexec/xscreensaver/config/ssystem.xml
libexec/xscreensaver/config/stairs.xml
Home |
Main Index |
Thread Index |
Old Index