diff options
author | wiz <wiz> | 2005-03-24 13:55:42 +0000 |
---|---|---|
committer | wiz <wiz> | 2005-03-24 13:55:42 +0000 |
commit | 64847e53997e2e8d95283683132bc363af42ca9f (patch) | |
tree | a39c34f3f7a5826ce00a3fa240f4a6e4d4fc5162 /x11/xscreensaver | |
parent | 0a2e7d9332338c65f3be0c888b09545a8e564844 (diff) | |
download | pkgsrc-64847e53997e2e8d95283683132bc363af42ca9f.tar.gz |
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 (limited to 'x11/xscreensaver')
-rw-r--r-- | x11/xscreensaver/Makefile | 2 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 12 | ||||
-rw-r--r-- | x11/xscreensaver/PLIST | 50 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 14 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ab | 6 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ac | 38 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ad | 64 |
7 files changed, 70 insertions, 116 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 37155a54de8..df1c77d5e0b 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -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 --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index f840d6d740c..349c6a6b45b 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -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+= INTLTOOL_PERL="${PERL5}" 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 @@ PATCHDIR= ${.CURDIR}/../../x11/xscreensaver/patches .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 --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 5acc8ad79cb..a3c49549cb2 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -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/blaster 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/blaster.xml 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/demon.xml 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/eruption.xml 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/glplanet.xml 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/hypertorus.xml 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/penrose.xml 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/slip.xml 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 libexec/xscreensaver/config/starfish.xml libexec/xscreensaver/config/starwars.xml libexec/xscreensaver/config/stonerview.xml libexec/xscreensaver/config/strange.xml +libexec/xscreensaver/config/substrate.xml libexec/xscreensaver/config/superquadrics.xml libexec/xscreensaver/config/swirl.xml libexec/xscreensaver/config/t3d.xml @@ -219,18 +225,11 @@ 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 -libexec/xscreensaver/config/xearth.xml -libexec/xscreensaver/config/xfishtank.xml libexec/xscreensaver/config/xflame.xml libexec/xscreensaver/config/xjack.xml 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 libexec/xscreensaver/config/xteevee.xml libexec/xscreensaver/config/zoom.xml @@ -255,10 +254,13 @@ libexec/xscreensaver/eruption libexec/xscreensaver/euler2d libexec/xscreensaver/extrusion libexec/xscreensaver/fadeplot +libexec/xscreensaver/fiberlamp +libexec/xscreensaver/fireworkx libexec/xscreensaver/flag libexec/xscreensaver/flame libexec/xscreensaver/flipflop libexec/xscreensaver/flipscreen3d +libexec/xscreensaver/fliptext libexec/xscreensaver/flow libexec/xscreensaver/fluidballs libexec/xscreensaver/flurry @@ -291,6 +293,7 @@ libexec/xscreensaver/hypertorus libexec/xscreensaver/ifs libexec/xscreensaver/imsmap libexec/xscreensaver/interference +libexec/xscreensaver/intermomentary libexec/xscreensaver/jigglypuff libexec/xscreensaver/jigsaw libexec/xscreensaver/juggle @@ -330,6 +333,7 @@ libexec/xscreensaver/penrose libexec/xscreensaver/petri libexec/xscreensaver/phosphor libexec/xscreensaver/piecewise +libexec/xscreensaver/pinion libexec/xscreensaver/pipes libexec/xscreensaver/polyhedra libexec/xscreensaver/polyominoes @@ -367,6 +371,7 @@ libexec/xscreensaver/starfish libexec/xscreensaver/starwars libexec/xscreensaver/stonerview libexec/xscreensaver/strange +libexec/xscreensaver/substrate libexec/xscreensaver/superquadrics libexec/xscreensaver/swirl libexec/xscreensaver/t3d @@ -408,15 +413,18 @@ man/man1/blaster.1 man/man1/blinkbox.1 man/man1/blitspin.1 man/man1/blocktube.1 +man/man1/boing.1 man/man1/bouboule.1 man/man1/bouncingcow.1 man/man1/boxed.1 +man/man1/boxfit.1 man/man1/braid.1 man/man1/bsod.1 man/man1/bubble3d.1 man/man1/bubbles.1 man/man1/bumps.1 man/man1/cage.1 +man/man1/carousel.1 man/man1/ccurve.1 man/man1/circuit.1 man/man1/cloudlife.1 @@ -442,10 +450,13 @@ man/man1/eruption.1 man/man1/euler2d.1 man/man1/extrusion.1 man/man1/fadeplot.1 +man/man1/fiberlamp.1 +man/man1/fireworkx.1 man/man1/flag.1 man/man1/flame.1 man/man1/flipflop.1 man/man1/flipscreen3d.1 +man/man1/fliptext.1 man/man1/flow.1 man/man1/fluidballs.1 man/man1/flurry.1 @@ -478,6 +489,7 @@ man/man1/hypertorus.1 man/man1/ifs.1 man/man1/imsmap.1 man/man1/interference.1 +man/man1/intermomentary.1 man/man1/jigglypuff.1 man/man1/jigsaw.1 man/man1/juggle.1 @@ -517,6 +529,7 @@ man/man1/penrose.1 man/man1/petri.1 man/man1/phosphor.1 man/man1/piecewise.1 +man/man1/pinion.1 man/man1/pipes.1 man/man1/polyhedra.1 man/man1/polyominoes.1 @@ -553,6 +566,7 @@ man/man1/starfish.1 man/man1/starwars.1 man/man1/stonerview.1 man/man1/strange.1 +man/man1/substrate.1 man/man1/superquadrics.1 man/man1/swirl.1 man/man1/t3d.1 @@ -581,16 +595,18 @@ man/man1/xscreensaver-getimage-file.1 man/man1/xscreensaver-getimage-video.1 man/man1/xscreensaver-getimage.1 man/man1/xscreensaver-gl-helper.1 +man/man1/xscreensaver-text.1 man/man1/xscreensaver.1 man/man1/xspirograph.1 man/man1/xsublim.1 man/man1/xteevee.1 man/man1/zoom.1 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xscreensaver.mo -${AVAILABLE}${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xscreensaver.mo -${AVAILABLE}${PKGLOCALEDIR}/locale/fr/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/ja/LC_MESSAGES/xscreensaver.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xscreensaver.mo diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 6e425ed1a59..6642e4ae2b1 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.39 2005/02/23 17:36:25 wiz Exp $ +$NetBSD: distinfo,v 1.40 2005/03/24 13:55:42 wiz Exp $ -SHA1 (xscreensaver-4.18.tar.gz) = 8f7fdf53dbcc3cc96c5d9d4165c66289859d80c5 -RMD160 (xscreensaver-4.18.tar.gz) = 9afb0217e3ab1065b87a264b6bf3eefdefe2abe4 -Size (xscreensaver-4.18.tar.gz) = 4252004 bytes +SHA1 (xscreensaver-4.21.tar.gz) = 2f6aa051a2f9e9f041133c0a60746e830228f09b +RMD160 (xscreensaver-4.21.tar.gz) = ae31d5e57ce9e2eece3dfba424af9ebab2c12993 +Size (xscreensaver-4.21.tar.gz) = 4519828 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 -SHA1 (patch-ab) = 29fad502419dc3e5e1acd28a7b86e1a0fe140113 -SHA1 (patch-ac) = 6b749c5f987107af00c6817243368ff46762b25a -SHA1 (patch-ad) = da46433afc0df48d20c6810600fb8bcb1f54ffb6 +SHA1 (patch-ab) = b67eccd08776b212935959447a27662da1e54ae3 +SHA1 (patch-ac) = e4711dc13810555071150268eb26b848f8eb1987 +SHA1 (patch-ad) = a93850f81e2692ff90bedc7b0257b8d0a4c7ff3f 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 60401c15dff..bc0056ac50f 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.13 2004/09/27 14:19:44 wiz Exp $ +$NetBSD: patch-ab,v 1.14 2005/03/24 13:55:42 wiz Exp $ ---- configure.in.orig 2004-08-09 10:26:19.000000000 +0200 +--- configure.in.orig 2005-03-21 07:43:24.000000000 +0100 +++ configure.in -@@ -1722,7 +1722,7 @@ if test "$enable_locking" = yes -a "$wit +@@ -1663,7 +1663,7 @@ if test "$enable_locking" = yes -a "$wit # from Matt Knopp <mhat@infocalypse.netlag.com> # (who got it from amu@mit.edu) diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index a2ef6438a8d..53a12dd70e5 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.13 2004/09/27 14:19:44 wiz Exp $ +$NetBSD: patch-ac,v 1.14 2005/03/24 13:55:42 wiz Exp $ ---- configure.orig 2004-08-15 00:22:36.000000000 +0200 +--- configure.orig 2005-03-21 08:18:18.000000000 +0100 +++ configure -@@ -2689,6 +2689,9 @@ echo "${ECHO_T}Turning on SGI compiler w +@@ -2686,6 +2686,9 @@ echo "${ECHO_T}Turning on SGI compiler w esac fi @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.13 2004/09/27 14:19:44 wiz Exp $ if test -n "$GCC"; then if test -n "$GCC"; then echo "$as_me:$LINENO: checking whether gcc accepts -std" >&5 -@@ -2735,6 +2738,7 @@ echo "${ECHO_T}Disabling C++ comments in +@@ -2732,6 +2735,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.13 2004/09/27 14:19:44 wiz Exp $ if test -n "$GCC"; then if test -n "$GCC"; then -@@ -13226,7 +13230,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -12786,7 +12790,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.13 2004/09/27 14:19:44 wiz Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13316,7 +13320,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -12876,7 +12880,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp <mhat@infocalypse.netlag.com> # (who got it from amu@mit.edu) @@ -38,24 +38,16 @@ $NetBSD: patch-ac,v 1.13 2004/09/27 14:19:44 wiz Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -15535,19 +15539,7 @@ fi - fi - +@@ -14513,11 +14517,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > + ac_gtk_config_libs=$ac_cv_gtk_config_libs -- GNOME_DATADIR="" + GTK_EXTRA_OBJS="" +- GTK_DATADIR="" - if test "$have_gtk" = yes; then -- if test -n "$pkg_config"; then -- if test "$have_gtk2" = yes; then -- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` -- else -- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+` -- fi -- else -- GNOME_DATADIR=`$gtk_config --prefix` -- fi -- GNOME_DATADIR="$GNOME_DATADIR/share" +- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` +- GTK_DATADIR="$GTK_DATADIR/share" - fi -+ GNOME_DATADIR="$datadir" ++ GTK_DATADIR="$datadir" - # .desktop files go in different places in Gnome 1.x and Gnome 2.x... - if test "$have_gtk2" = yes; then + if test "$have_gtk" = yes; then + INCLUDES="$INCLUDES $ac_gtk_config_cflags" diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad index cb8672cb414..4dbcdc62dea 100644 --- a/x11/xscreensaver/patches/patch-ad +++ b/x11/xscreensaver/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.13 2004/09/27 14:19:44 wiz Exp $ +$NetBSD: patch-ad,v 1.14 2005/03/24 13:55:42 wiz Exp $ ---- driver/Makefile.in.orig 2004-08-15 00:22:38.000000000 +0200 +--- driver/Makefile.in.orig 2005-03-21 08:18:18.000000000 +0100 +++ driver/Makefile.in -@@ -292,7 +292,7 @@ install-program: $(EXES) +@@ -288,7 +288,7 @@ install-program: $(EXES) fi ; \ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @@ -11,58 +11,12 @@ $NetBSD: patch-ad,v 1.13 2004/09/27 14:19:44 wiz Exp $ xscreensaver-getimage @EXES_OSX@ ; do \ echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \ -@@ -467,7 +467,7 @@ install-pam: - fi ; \ - fi +@@ -464,7 +464,7 @@ install-pam: + # screensaver-properties.desktop + # into /usr/share/applications/ -install-gnome:: screensaver-properties.desktop +xxxinstall-gnome:: screensaver-properties.desktop - @lost="" ;\ - if [ "$(GNOME_DATADIR)" != "" ]; then \ - \ -@@ -475,10 +475,6 @@ install-gnome:: screensaver-properties.d - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)" ;\ - fi ;\ -- if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then \ -- echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ -- $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)" ;\ -- fi ;\ - if [ ! -d "$(install_prefix)$(GNOME_CCDIR_3)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ - $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_3)" ;\ -@@ -499,16 +495,6 @@ install-gnome:: screensaver-properties.d - fi ;\ - \ - echo $(INSTALL_DATA) screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ -- \ -- if $(INSTALL_DATA) screensaver-properties.desktop \ -- $(install_prefix)$(GNOME_CCDIR_2)/screensaver-properties.desktop;\ -- then true ;\ -- else \ -- lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)" ;\ -- fi ;\ -- \ -- echo $(INSTALL_DATA) screensaver-properties.desktop \ - $(install_prefix)$(GNOME_CCDIR_3)/screensaver-properties.desktop;\ - \ - if $(INSTALL_DATA) screensaver-properties.desktop \ -@@ -542,7 +528,7 @@ install-gnome:: screensaver-properties.d - fi ;\ - fi - --install-gnome:: screensaver-properties-capplet -+xxxinstall-gnome:: screensaver-properties-capplet - @if [ "$(GNOME_DATADIR)" != "" ]; then \ - if [ ! -d "$(install_prefix)$(GNOME_BINDIR)" ]; then \ - echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)" ;\ -@@ -641,8 +627,6 @@ uninstall-gnome:: - f=screensaver-properties.desktop ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_1)/$$f ;\ -- echo rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ -- rm -f $(install_prefix)$(GNOME_CCDIR_2)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ - rm -f $(install_prefix)$(GNOME_CCDIR_3)/$$f ;\ - echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f ;\ + @if [ "$(GTK_DATADIR)" != "" ]; then \ + if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ |