diff options
author | drochner <drochner> | 2009-01-14 13:29:15 +0000 |
---|---|---|
committer | drochner <drochner> | 2009-01-14 13:29:15 +0000 |
commit | 6ea9b293aea3bfa81ba4b9bea80a9dad0bc70fa1 (patch) | |
tree | 8f167495d2249186b6ebcc71d5c57cba8c69c544 /x11 | |
parent | a91d952b5fcf34a41baa864e490fbad004b15d7e (diff) | |
download | pkgsrc-6ea9b293aea3bfa81ba4b9bea80a9dad0bc70fa1.tar.gz |
update to 5.08
changes:
New hack, photopile.
Rewrote sonar and jigsaw as OpenGL programs.
Minor tweaks to maze, m6502, hypnowheel, and timetunnel.
Savers that load images now obey EXIF rotation tags.
Arrgh, more RANDR noise! Fixes this time for rotated screens, and for
systems where RANDR lies and says the screen size is 0x0.
When the password dialog has timed out or been cancelled, don't pop it
right back up a second time.
Password timeouts/cancels don't count as ``failed logins''.
Retired some of the older, less interesting savers: say goodbye to
bubbles, critical, flag, forest, glforestfire, lmorph, laser, lightning,
lisa, lissie, rotor, sphere, spiral, t3d, vines, whirlygig, and worm.
Merged munch and mismunch.
Updated webcollage to use twitpic.com as well.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xscreensaver/Makefile.common | 4 | ||||
-rw-r--r-- | x11/xscreensaver/PLIST | 72 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 13 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ab | 12 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-ac | 22 | ||||
-rw-r--r-- | x11/xscreensaver/patches/patch-aj | 14 |
6 files changed, 29 insertions, 108 deletions
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index b8761452a93..ccc272a4c19 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.97 2008/07/30 20:18:36 drochner Exp $ +# $NetBSD: Makefile.common,v 1.98 2009/01/14 13:29:15 drochner Exp $ # # When updating the package, # please check kdeartwork3 -- it installs some extra # files depending on which screensavers it finds. -DISTNAME= xscreensaver-5.06 +DISTNAME= xscreensaver-5.08 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 0c38f9054fb..880743e3bdb 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.33 2008/07/30 20:18:36 drochner Exp $ +@comment $NetBSD: PLIST,v 1.34 2009/01/14 13:29:15 drochner Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-getimage @@ -31,7 +31,6 @@ libexec/xscreensaver/boxfit libexec/xscreensaver/braid libexec/xscreensaver/bsod libexec/xscreensaver/bubble3d -libexec/xscreensaver/bubbles libexec/xscreensaver/bumps libexec/xscreensaver/cage libexec/xscreensaver/carousel @@ -65,7 +64,6 @@ 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 @@ -75,9 +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/cosmos.xml libexec/xscreensaver/config/crackberg.xml -libexec/xscreensaver/config/critical.xml libexec/xscreensaver/config/crystal.xml libexec/xscreensaver/config/cube21.xml libexec/xscreensaver/config/cubenetic.xml @@ -93,7 +89,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 @@ -102,9 +97,7 @@ libexec/xscreensaver/config/euler2d.xml libexec/xscreensaver/config/extrusion.xml libexec/xscreensaver/config/fadeplot.xml libexec/xscreensaver/config/fiberlamp.xml -libexec/xscreensaver/config/fireflies.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 @@ -114,7 +107,6 @@ libexec/xscreensaver/config/fluidballs.xml libexec/xscreensaver/config/flurry.xml libexec/xscreensaver/config/flyingtoasters.xml libexec/xscreensaver/config/fontglide.xml -libexec/xscreensaver/config/forest.xml libexec/xscreensaver/config/fuzzyflakes.xml libexec/xscreensaver/config/galaxy.xml libexec/xscreensaver/config/gears.xml @@ -122,7 +114,6 @@ libexec/xscreensaver/config/gflux.xml libexec/xscreensaver/config/glblur.xml libexec/xscreensaver/config/glcells.xml libexec/xscreensaver/config/gleidescope.xml -libexec/xscreensaver/config/glforestfire.xml libexec/xscreensaver/config/glhanoi.xml libexec/xscreensaver/config/glknots.xml libexec/xscreensaver/config/glmatrix.xml @@ -131,7 +122,6 @@ libexec/xscreensaver/config/glschool.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 @@ -157,13 +147,8 @@ libexec/xscreensaver/config/kaleidescope.xml libexec/xscreensaver/config/klein.xml libexec/xscreensaver/config/kumppa.xml libexec/xscreensaver/config/lament.xml -libexec/xscreensaver/config/laser.xml libexec/xscreensaver/config/lavalite.xml libexec/xscreensaver/config/lcdscrub.xml -libexec/xscreensaver/config/lightning.xml -libexec/xscreensaver/config/lisa.xml -libexec/xscreensaver/config/lissie.xml -libexec/xscreensaver/config/lmorph.xml libexec/xscreensaver/config/lockward.xml libexec/xscreensaver/config/loop.xml libexec/xscreensaver/config/m6502.xml @@ -172,7 +157,6 @@ libexec/xscreensaver/config/memscroller.xml 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/moebiusgears.xml libexec/xscreensaver/config/moire.xml @@ -190,6 +174,7 @@ libexec/xscreensaver/config/penetrate.xml libexec/xscreensaver/config/penrose.xml libexec/xscreensaver/config/petri.xml libexec/xscreensaver/config/phosphor.xml +libexec/xscreensaver/config/photopile.xml libexec/xscreensaver/config/piecewise.xml libexec/xscreensaver/config/pinion.xml libexec/xscreensaver/config/pipes.xml @@ -207,7 +192,6 @@ libexec/xscreensaver/config/rd-bomb.xml libexec/xscreensaver/config/ripples.xml libexec/xscreensaver/config/rocks.xml libexec/xscreensaver/config/rorschach.xml -libexec/xscreensaver/config/rotor.xml libexec/xscreensaver/config/rotzoomer.xml libexec/xscreensaver/config/rubik.xml libexec/xscreensaver/config/sballs.xml @@ -219,10 +203,7 @@ libexec/xscreensaver/config/slidescreen.xml 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 @@ -234,7 +215,6 @@ 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 libexec/xscreensaver/config/tangram.xml libexec/xscreensaver/config/thornbird.xml libexec/xscreensaver/config/timetunnel.xml @@ -244,29 +224,20 @@ libexec/xscreensaver/config/truchet.xml libexec/xscreensaver/config/twang.xml libexec/xscreensaver/config/vermiculate.xml libexec/xscreensaver/config/vidwhacker.xml -libexec/xscreensaver/config/vines.xml libexec/xscreensaver/config/voronoi.xml libexec/xscreensaver/config/wander.xml 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 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/zoom.xml libexec/xscreensaver/coral libexec/xscreensaver/crackberg -libexec/xscreensaver/critical libexec/xscreensaver/crystal libexec/xscreensaver/cube21 libexec/xscreensaver/cubenetic @@ -291,7 +262,6 @@ libexec/xscreensaver/extrusion libexec/xscreensaver/fadeplot libexec/xscreensaver/fiberlamp libexec/xscreensaver/fireworkx -libexec/xscreensaver/flag libexec/xscreensaver/flame libexec/xscreensaver/flipflop libexec/xscreensaver/flipscreen3d @@ -301,7 +271,6 @@ libexec/xscreensaver/fluidballs libexec/xscreensaver/flurry libexec/xscreensaver/flyingtoasters libexec/xscreensaver/fontglide -libexec/xscreensaver/forest libexec/xscreensaver/fuzzyflakes libexec/xscreensaver/galaxy libexec/xscreensaver/gears @@ -309,7 +278,6 @@ libexec/xscreensaver/gflux libexec/xscreensaver/glblur libexec/xscreensaver/glcells libexec/xscreensaver/gleidescope -libexec/xscreensaver/glforestfire libexec/xscreensaver/glhanoi libexec/xscreensaver/glknots libexec/xscreensaver/glmatrix @@ -343,14 +311,9 @@ libexec/xscreensaver/kaleidescope libexec/xscreensaver/klein libexec/xscreensaver/kumppa libexec/xscreensaver/lament -libexec/xscreensaver/laser libexec/xscreensaver/lavalite libexec/xscreensaver/lcdscrub -libexec/xscreensaver/lightning -libexec/xscreensaver/lisa -libexec/xscreensaver/lissie libexec/xscreensaver/ljlatest -libexec/xscreensaver/lmorph libexec/xscreensaver/lockward libexec/xscreensaver/loop libexec/xscreensaver/m6502 @@ -359,7 +322,6 @@ libexec/xscreensaver/memscroller libexec/xscreensaver/menger libexec/xscreensaver/metaballs libexec/xscreensaver/mirrorblob -libexec/xscreensaver/mismunch libexec/xscreensaver/moebius libexec/xscreensaver/moebiusgears libexec/xscreensaver/moire @@ -377,6 +339,7 @@ libexec/xscreensaver/penetrate libexec/xscreensaver/penrose libexec/xscreensaver/petri libexec/xscreensaver/phosphor +libexec/xscreensaver/photopile libexec/xscreensaver/piecewise libexec/xscreensaver/pinion libexec/xscreensaver/pipes @@ -394,7 +357,6 @@ libexec/xscreensaver/rd-bomb libexec/xscreensaver/ripples libexec/xscreensaver/rocks libexec/xscreensaver/rorschach -libexec/xscreensaver/rotor libexec/xscreensaver/rotzoomer libexec/xscreensaver/rubik libexec/xscreensaver/sballs @@ -406,9 +368,7 @@ libexec/xscreensaver/slidescreen libexec/xscreensaver/slip libexec/xscreensaver/sonar libexec/xscreensaver/speedmine -libexec/xscreensaver/sphere libexec/xscreensaver/spheremonics -libexec/xscreensaver/spiral libexec/xscreensaver/spotlight libexec/xscreensaver/sproingies libexec/xscreensaver/squiral @@ -420,7 +380,6 @@ libexec/xscreensaver/strange libexec/xscreensaver/substrate libexec/xscreensaver/superquadrics libexec/xscreensaver/swirl -libexec/xscreensaver/t3d libexec/xscreensaver/tangram libexec/xscreensaver/thornbird libexec/xscreensaver/timetunnel @@ -430,12 +389,9 @@ libexec/xscreensaver/truchet libexec/xscreensaver/twang libexec/xscreensaver/vermiculate libexec/xscreensaver/vidwhacker -libexec/xscreensaver/vines libexec/xscreensaver/voronoi libexec/xscreensaver/wander libexec/xscreensaver/whirlwindwarp -libexec/xscreensaver/whirlygig -libexec/xscreensaver/worm libexec/xscreensaver/wormhole libexec/xscreensaver/xanalogtv libexec/xscreensaver/xflame @@ -444,7 +400,6 @@ libexec/xscreensaver/xlyap libexec/xscreensaver/xmatrix libexec/xscreensaver/xrayswarm libexec/xscreensaver/xspirograph -libexec/xscreensaver/xsublim libexec/xscreensaver/zoom man/man1/xscreensaver-command.1 man/man1/xscreensaver-getimage-file.1 @@ -476,7 +431,6 @@ man/man6/boxfit.6 man/man6/braid.6 man/man6/bsod.6 man/man6/bubble3d.6 -man/man6/bubbles.6 man/man6/bumps.6 man/man6/cage.6 man/man6/carousel.6 @@ -487,7 +441,6 @@ man/man6/cloudlife.6 man/man6/compass.6 man/man6/coral.6 man/man6/crackberg.6 -man/man6/critical.6 man/man6/crystal.6 man/man6/cube21.6 man/man6/cubenetic.6 @@ -512,7 +465,6 @@ man/man6/extrusion.6 man/man6/fadeplot.6 man/man6/fiberlamp.6 man/man6/fireworkx.6 -man/man6/flag.6 man/man6/flame.6 man/man6/flipflop.6 man/man6/flipscreen3d.6 @@ -522,7 +474,6 @@ man/man6/fluidballs.6 man/man6/flurry.6 man/man6/flyingtoasters.6 man/man6/fontglide.6 -man/man6/forest.6 man/man6/fuzzyflakes.6 man/man6/galaxy.6 man/man6/gears.6 @@ -530,7 +481,6 @@ man/man6/gflux.6 man/man6/glblur.6 man/man6/glcells.6 man/man6/gleidescope.6 -man/man6/glforestfire.6 man/man6/glhanoi.6 man/man6/glknots.6 man/man6/glmatrix.6 @@ -564,14 +514,9 @@ man/man6/kaleidescope.6 man/man6/klein.6 man/man6/kumppa.6 man/man6/lament.6 -man/man6/laser.6 man/man6/lavalite.6 man/man6/lcdscrub.6 -man/man6/lightning.6 -man/man6/lisa.6 -man/man6/lissie.6 man/man6/ljlatest.6 -man/man6/lmorph.6 man/man6/lockward.6 man/man6/loop.6 man/man6/maze.6 @@ -579,7 +524,6 @@ man/man6/memscroller.6 man/man6/menger.6 man/man6/metaballs.6 man/man6/mirrorblob.6 -man/man6/mismunch.6 man/man6/moebius.6 man/man6/moebiusgears.6 man/man6/moire.6 @@ -597,6 +541,7 @@ man/man6/penetrate.6 man/man6/penrose.6 man/man6/petri.6 man/man6/phosphor.6 +man/man6/photopile.6 man/man6/piecewise.6 man/man6/pinion.6 man/man6/pipes.6 @@ -613,7 +558,6 @@ man/man6/rd-bomb.6 man/man6/ripples.6 man/man6/rocks.6 man/man6/rorschach.6 -man/man6/rotor.6 man/man6/rotzoomer.6 man/man6/rubik.6 man/man6/sballs.6 @@ -625,9 +569,7 @@ man/man6/slidescreen.6 man/man6/slip.6 man/man6/sonar.6 man/man6/speedmine.6 -man/man6/sphere.6 man/man6/spheremonics.6 -man/man6/spiral.6 man/man6/spotlight.6 man/man6/sproingies.6 man/man6/squiral.6 @@ -639,7 +581,6 @@ man/man6/strange.6 man/man6/substrate.6 man/man6/superquadrics.6 man/man6/swirl.6 -man/man6/t3d.6 man/man6/tangram.6 man/man6/thornbird.6 man/man6/timetunnel.6 @@ -649,12 +590,9 @@ man/man6/truchet.6 man/man6/twang.6 man/man6/vermiculate.6 man/man6/vidwhacker.6 -man/man6/vines.6 man/man6/voronoi.6 man/man6/wander.6 man/man6/whirlwindwarp.6 -man/man6/whirlygig.6 -man/man6/worm.6 man/man6/wormhole.6 man/man6/xanalogtv.6 man/man6/xflame.6 @@ -664,7 +602,6 @@ man/man6/xmatrix.6 man/man6/xrayswarm.6 man/man6/xscreensaver-gl-helper.6 man/man6/xspirograph.6 -man/man6/xsublim.6 man/man6/zoom.6 share/examples/xscreensaver/pam.d/xscreensaver-NetBSD share/locale/da/LC_MESSAGES/xscreensaver.mo @@ -679,7 +616,6 @@ share/locale/ja/LC_MESSAGES/xscreensaver.mo share/locale/ko/LC_MESSAGES/xscreensaver.mo share/locale/nb/LC_MESSAGES/xscreensaver.mo share/locale/nl/LC_MESSAGES/xscreensaver.mo -share/locale/no/LC_MESSAGES/xscreensaver.mo share/locale/pl/LC_MESSAGES/xscreensaver.mo share/locale/pt/LC_MESSAGES/xscreensaver.mo share/locale/ru/LC_MESSAGES/xscreensaver.mo diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 90d1eff8e2c..c9411e12377 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.53 2008/07/30 20:18:36 drochner Exp $ +$NetBSD: distinfo,v 1.54 2009/01/14 13:29:15 drochner Exp $ -SHA1 (xscreensaver-5.06.tar.gz) = 3310789ecf1ed8ff790d94512fe536857e793e4c -RMD160 (xscreensaver-5.06.tar.gz) = de164ee7f68094f77b28dcfaa3279953f98cba83 -Size (xscreensaver-5.06.tar.gz) = 5486779 bytes +SHA1 (xscreensaver-5.08.tar.gz) = 4e6889d7171eaf18b856c484a87d5701787e5dc6 +RMD160 (xscreensaver-5.08.tar.gz) = f37ba887a656a4ffd14f3809de3269806271352d +Size (xscreensaver-5.08.tar.gz) = 5466460 bytes SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 -SHA1 (patch-ab) = d49a0854e40d6e0dcd9dfcec9c4007d0dd62dfdb -SHA1 (patch-ac) = 8ca1464ac1b0748755405977a436e51a2a288329 +SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f +SHA1 (patch-ac) = 5704efa8940569febc95d49eade2dca0e764f0f1 SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5 -SHA1 (patch-aj) = 053c64a595423a65e9b3bde474ae2e19f3382cf7 diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab index acf2f790883..ce2b48bcef9 100644 --- a/x11/xscreensaver/patches/patch-ab +++ b/x11/xscreensaver/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.17 2006/07/18 18:40:36 wiz Exp $ +$NetBSD: patch-ab,v 1.18 2009/01/14 13:29:15 drochner Exp $ ---- configure.in.orig 2006-05-23 22:07:00.000000000 +0000 +--- configure.in.orig 2008-12-27 22:12:27.000000000 +0100 +++ configure.in -@@ -1171,7 +1171,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA +@@ -1185,7 +1185,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PA generated code.]) AC_SUBST(GETTEXT_PACKAGE) --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" -+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" +-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" ++ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW" AM_GLIB_GNU_GETTEXT MKINSTALLDIRS="$INSTALL_DIRS" -@@ -1937,7 +1937,7 @@ if test "$enable_locking" = yes -a "$wit +@@ -1995,7 +1995,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 a796ce6b89b..451f9b063d0 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ +$NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ ---- configure.orig 2008-07-16 23:40:47.000000000 +0200 +--- configure.orig 2008-12-28 08:59:19.000000000 +0100 +++ configure -@@ -3500,6 +3500,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp +@@ -3504,6 +3504,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" fi @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ if test -n "$GCC"; then if test -n "$GCC"; then { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 -@@ -3550,6 +3553,7 @@ echo "${ECHO_T}Disabling C++ comments in +@@ -3554,6 +3557,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,16 +20,16 @@ $NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -7921,7 +7925,7 @@ _ACEOF +@@ -7925,7 +7929,7 @@ _ACEOF --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" -+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" +-ALL_LINGUAS="ca da de es et fi fr hu it ja ko nb nl pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" ++ALL_LINGUAS="da de es et fi fr hu it ja ko nb nl pl pt ru sk sv vi wa zh_CN zh_TW" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -@@ -13640,7 +13644,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -13644,7 +13648,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 @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13727,7 +13731,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -13731,7 +13735,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp <mhat@infocalypse.netlag.com> # (who got it from amu@mit.edu) @@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -14889,7 +14893,7 @@ fi +@@ -14893,7 +14897,7 @@ fi # if test "$enable_locking" = yes ; then case "$host" in @@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.20 2008/07/30 20:18:37 drochner Exp $ need_setuid=yes ;; esac -@@ -15323,11 +15327,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > +@@ -15327,11 +15331,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-aj b/x11/xscreensaver/patches/patch-aj deleted file mode 100644 index 920ad11f2b1..00000000000 --- a/x11/xscreensaver/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$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)); |