Convert to DATADIR macro

Resort one item while I'm here

1 files changed, 210 insertions, 210 deletions

diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index b2bdccb31b9b..22803e5129c9 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -5,7 +5,6 @@ bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
-bin/xscreensaver-text
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
 bin/xscreensaver-hacks/ant
@@ -206,215 +205,216 @@ bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
+bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
 share/pixmaps/xscreensaver.xpm
-share/xscreensaver/config/README
-share/xscreensaver/config/anemone.xml
-share/xscreensaver/config/anemotaxis.xml
-share/xscreensaver/config/ant.xml
-share/xscreensaver/config/antinspect.xml
-share/xscreensaver/config/antmaze.xml
-share/xscreensaver/config/antspotlight.xml
-share/xscreensaver/config/apollonian.xml
-share/xscreensaver/config/apple2.xml
-share/xscreensaver/config/atlantis.xml
-share/xscreensaver/config/attraction.xml
-share/xscreensaver/config/atunnel.xml
-share/xscreensaver/config/barcode.xml
-share/xscreensaver/config/blaster.xml
-share/xscreensaver/config/blinkbox.xml
-share/xscreensaver/config/blitspin.xml
-share/xscreensaver/config/blocktube.xml
-share/xscreensaver/config/boing.xml
-share/xscreensaver/config/bouboule.xml
-share/xscreensaver/config/bouncingcow.xml
-share/xscreensaver/config/boxed.xml
-share/xscreensaver/config/boxfit.xml
-share/xscreensaver/config/braid.xml
-share/xscreensaver/config/bsod.xml
-share/xscreensaver/config/bubble3d.xml
-share/xscreensaver/config/bubbles.xml
-share/xscreensaver/config/bumps.xml
-share/xscreensaver/config/cage.xml
-share/xscreensaver/config/carousel.xml
-share/xscreensaver/config/ccurve.xml
-share/xscreensaver/config/circuit.xml
-share/xscreensaver/config/cloudlife.xml
-share/xscreensaver/config/compass.xml
-share/xscreensaver/config/coral.xml
-share/xscreensaver/config/crackberg.xml
-share/xscreensaver/config/critical.xml
-share/xscreensaver/config/crystal.xml
-share/xscreensaver/config/cubenetic.xml
-share/xscreensaver/config/cubestorm.xml
-share/xscreensaver/config/cynosure.xml
-share/xscreensaver/config/dangerball.xml
-share/xscreensaver/config/decayscreen.xml
-share/xscreensaver/config/deco.xml
-share/xscreensaver/config/deluxe.xml
-share/xscreensaver/config/demon.xml
-share/xscreensaver/config/discrete.xml
-share/xscreensaver/config/distort.xml
-share/xscreensaver/config/drift.xml
-share/xscreensaver/config/endgame.xml
-share/xscreensaver/config/engine.xml
-share/xscreensaver/config/epicycle.xml
-share/xscreensaver/config/eruption.xml
-share/xscreensaver/config/euler2d.xml
-share/xscreensaver/config/extrusion.xml
-share/xscreensaver/config/fadeplot.xml
-share/xscreensaver/config/fiberlamp.xml
-share/xscreensaver/config/fireworkx.xml
-share/xscreensaver/config/flag.xml
-share/xscreensaver/config/flame.xml
-share/xscreensaver/config/flipflop.xml
-share/xscreensaver/config/flipscreen3d.xml
-share/xscreensaver/config/fliptext.xml
-share/xscreensaver/config/flow.xml
-share/xscreensaver/config/fluidballs.xml
-share/xscreensaver/config/flurry.xml
-share/xscreensaver/config/flyingtoasters.xml
-share/xscreensaver/config/fontglide.xml
-share/xscreensaver/config/forest.xml
-share/xscreensaver/config/fuzzyflakes.xml
-share/xscreensaver/config/galaxy.xml
-share/xscreensaver/config/gears.xml
-share/xscreensaver/config/gflux.xml
-share/xscreensaver/config/glblur.xml
-share/xscreensaver/config/gleidescope.xml
-share/xscreensaver/config/glforestfire.xml
-share/xscreensaver/config/glknots.xml
-share/xscreensaver/config/glmatrix.xml
-share/xscreensaver/config/glplanet.xml
-share/xscreensaver/config/glslideshow.xml
-share/xscreensaver/config/glsnake.xml
-share/xscreensaver/config/gltext.xml
-share/xscreensaver/config/goop.xml
-share/xscreensaver/config/grav.xml
-share/xscreensaver/config/greynetic.xml
-share/xscreensaver/config/halftone.xml
-share/xscreensaver/config/halo.xml
-share/xscreensaver/config/helix.xml
-share/xscreensaver/config/hopalong.xml
-share/xscreensaver/config/hyperball.xml
-share/xscreensaver/config/hypercube.xml
-share/xscreensaver/config/hypertorus.xml
-share/xscreensaver/config/ifs.xml
-share/xscreensaver/config/imsmap.xml
-share/xscreensaver/config/interaggregate.xml
-share/xscreensaver/config/interference.xml
-share/xscreensaver/config/intermomentary.xml
-share/xscreensaver/config/jigglypuff.xml
-share/xscreensaver/config/jigsaw.xml
-share/xscreensaver/config/juggle.xml
-share/xscreensaver/config/julia.xml
-share/xscreensaver/config/kaleidescope.xml
-share/xscreensaver/config/klein.xml
-share/xscreensaver/config/kumppa.xml
-share/xscreensaver/config/lament.xml
-share/xscreensaver/config/laser.xml
-share/xscreensaver/config/lavalite.xml
-share/xscreensaver/config/lightning.xml
-share/xscreensaver/config/lisa.xml
-share/xscreensaver/config/lissie.xml
-share/xscreensaver/config/lmorph.xml
-share/xscreensaver/config/loop.xml
-share/xscreensaver/config/maze.xml
-share/xscreensaver/config/memscroller.xml
-share/xscreensaver/config/menger.xml
-share/xscreensaver/config/metaballs.xml
-share/xscreensaver/config/mirrorblob.xml
-share/xscreensaver/config/mismunch.xml
-share/xscreensaver/config/moebius.xml
-share/xscreensaver/config/moire.xml
-share/xscreensaver/config/moire2.xml
-share/xscreensaver/config/molecule.xml
-share/xscreensaver/config/morph3d.xml
-share/xscreensaver/config/mountain.xml
-share/xscreensaver/config/munch.xml
-share/xscreensaver/config/nerverot.xml
-share/xscreensaver/config/noof.xml
-share/xscreensaver/config/noseguy.xml
-share/xscreensaver/config/pacman.xml
-share/xscreensaver/config/pedal.xml
-share/xscreensaver/config/penetrate.xml
-share/xscreensaver/config/penrose.xml
-share/xscreensaver/config/petri.xml
-share/xscreensaver/config/phosphor.xml
-share/xscreensaver/config/piecewise.xml
-share/xscreensaver/config/pinion.xml
-share/xscreensaver/config/pipes.xml
-share/xscreensaver/config/polyhedra.xml
-share/xscreensaver/config/polyominoes.xml
-share/xscreensaver/config/polytopes.xml
-share/xscreensaver/config/pong.xml
-share/xscreensaver/config/popsquares.xml
-share/xscreensaver/config/providence.xml
-share/xscreensaver/config/pulsar.xml
-share/xscreensaver/config/pyro.xml
-share/xscreensaver/config/qix.xml
-share/xscreensaver/config/queens.xml
-share/xscreensaver/config/rd-bomb.xml
-share/xscreensaver/config/ripples.xml
-share/xscreensaver/config/rocks.xml
-share/xscreensaver/config/rorschach.xml
-share/xscreensaver/config/rotor.xml
-share/xscreensaver/config/rotzoomer.xml
-share/xscreensaver/config/rubik.xml
-share/xscreensaver/config/sballs.xml
-share/xscreensaver/config/shadebobs.xml
-share/xscreensaver/config/sierpinski.xml
-share/xscreensaver/config/sierpinski3d.xml
-share/xscreensaver/config/slidescreen.xml
-share/xscreensaver/config/slip.xml
-share/xscreensaver/config/sonar.xml
-share/xscreensaver/config/speedmine.xml
-share/xscreensaver/config/sphere.xml
-share/xscreensaver/config/spheremonics.xml
-share/xscreensaver/config/spiral.xml
-share/xscreensaver/config/spotlight.xml
-share/xscreensaver/config/sproingies.xml
-share/xscreensaver/config/squiral.xml
-share/xscreensaver/config/stairs.xml
-share/xscreensaver/config/starfish.xml
-share/xscreensaver/config/starwars.xml
-share/xscreensaver/config/stonerview.xml
-share/xscreensaver/config/strange.xml
-share/xscreensaver/config/substrate.xml
-share/xscreensaver/config/superquadrics.xml
-share/xscreensaver/config/swirl.xml
-share/xscreensaver/config/t3d.xml
-share/xscreensaver/config/tangram.xml
-share/xscreensaver/config/thornbird.xml
-share/xscreensaver/config/triangle.xml
-share/xscreensaver/config/truchet.xml
-share/xscreensaver/config/twang.xml
-share/xscreensaver/config/vermiculate.xml
-share/xscreensaver/config/vidwhacker.xml
-share/xscreensaver/config/vines.xml
-share/xscreensaver/config/wander.xml
-share/xscreensaver/config/webcollage.xml
-share/xscreensaver/config/whirlwindwarp.xml
-share/xscreensaver/config/whirlygig.xml
-share/xscreensaver/config/worm.xml
-share/xscreensaver/config/wormhole.xml
-share/xscreensaver/config/xanalogtv.xml
-share/xscreensaver/config/xflame.xml
-share/xscreensaver/config/xjack.xml
-share/xscreensaver/config/xlyap.xml
-share/xscreensaver/config/xmatrix.xml
-share/xscreensaver/config/xrayswarm.xml
-share/xscreensaver/config/xspirograph.xml
-share/xscreensaver/config/xteevee.xml
-share/xscreensaver/config/zoom.xml
-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/config
-@dirrm share/xscreensaver/glade
-@dirrm share/xscreensaver
+%%DATADIR%%/config/README
+%%DATADIR%%/config/anemone.xml
+%%DATADIR%%/config/anemotaxis.xml
+%%DATADIR%%/config/ant.xml
+%%DATADIR%%/config/antinspect.xml
+%%DATADIR%%/config/antmaze.xml
+%%DATADIR%%/config/antspotlight.xml
+%%DATADIR%%/config/apollonian.xml
+%%DATADIR%%/config/apple2.xml
+%%DATADIR%%/config/atlantis.xml
+%%DATADIR%%/config/attraction.xml
+%%DATADIR%%/config/atunnel.xml
+%%DATADIR%%/config/barcode.xml
+%%DATADIR%%/config/blaster.xml
+%%DATADIR%%/config/blinkbox.xml
+%%DATADIR%%/config/blitspin.xml
+%%DATADIR%%/config/blocktube.xml
+%%DATADIR%%/config/boing.xml
+%%DATADIR%%/config/bouboule.xml
+%%DATADIR%%/config/bouncingcow.xml
+%%DATADIR%%/config/boxed.xml
+%%DATADIR%%/config/boxfit.xml
+%%DATADIR%%/config/braid.xml
+%%DATADIR%%/config/bsod.xml
+%%DATADIR%%/config/bubble3d.xml
+%%DATADIR%%/config/bubbles.xml
+%%DATADIR%%/config/bumps.xml
+%%DATADIR%%/config/cage.xml
+%%DATADIR%%/config/carousel.xml
+%%DATADIR%%/config/ccurve.xml
+%%DATADIR%%/config/circuit.xml
+%%DATADIR%%/config/cloudlife.xml
+%%DATADIR%%/config/compass.xml
+%%DATADIR%%/config/coral.xml
+%%DATADIR%%/config/crackberg.xml
+%%DATADIR%%/config/critical.xml
+%%DATADIR%%/config/crystal.xml
+%%DATADIR%%/config/cubenetic.xml
+%%DATADIR%%/config/cubestorm.xml
+%%DATADIR%%/config/cynosure.xml
+%%DATADIR%%/config/dangerball.xml
+%%DATADIR%%/config/decayscreen.xml
+%%DATADIR%%/config/deco.xml
+%%DATADIR%%/config/deluxe.xml
+%%DATADIR%%/config/demon.xml
+%%DATADIR%%/config/discrete.xml
+%%DATADIR%%/config/distort.xml
+%%DATADIR%%/config/drift.xml
+%%DATADIR%%/config/endgame.xml
+%%DATADIR%%/config/engine.xml
+%%DATADIR%%/config/epicycle.xml
+%%DATADIR%%/config/eruption.xml
+%%DATADIR%%/config/euler2d.xml
+%%DATADIR%%/config/extrusion.xml
+%%DATADIR%%/config/fadeplot.xml
+%%DATADIR%%/config/fiberlamp.xml
+%%DATADIR%%/config/fireworkx.xml
+%%DATADIR%%/config/flag.xml
+%%DATADIR%%/config/flame.xml
+%%DATADIR%%/config/flipflop.xml
+%%DATADIR%%/config/flipscreen3d.xml
+%%DATADIR%%/config/fliptext.xml
+%%DATADIR%%/config/flow.xml
+%%DATADIR%%/config/fluidballs.xml
+%%DATADIR%%/config/flurry.xml
+%%DATADIR%%/config/flyingtoasters.xml
+%%DATADIR%%/config/fontglide.xml
+%%DATADIR%%/config/forest.xml
+%%DATADIR%%/config/fuzzyflakes.xml
+%%DATADIR%%/config/galaxy.xml
+%%DATADIR%%/config/gears.xml
+%%DATADIR%%/config/gflux.xml
+%%DATADIR%%/config/glblur.xml
+%%DATADIR%%/config/gleidescope.xml
+%%DATADIR%%/config/glforestfire.xml
+%%DATADIR%%/config/glknots.xml
+%%DATADIR%%/config/glmatrix.xml
+%%DATADIR%%/config/glplanet.xml
+%%DATADIR%%/config/glslideshow.xml
+%%DATADIR%%/config/glsnake.xml
+%%DATADIR%%/config/gltext.xml
+%%DATADIR%%/config/goop.xml
+%%DATADIR%%/config/grav.xml
+%%DATADIR%%/config/greynetic.xml
+%%DATADIR%%/config/halftone.xml
+%%DATADIR%%/config/halo.xml
+%%DATADIR%%/config/helix.xml
+%%DATADIR%%/config/hopalong.xml
+%%DATADIR%%/config/hyperball.xml
+%%DATADIR%%/config/hypercube.xml
+%%DATADIR%%/config/hypertorus.xml
+%%DATADIR%%/config/ifs.xml
+%%DATADIR%%/config/imsmap.xml
+%%DATADIR%%/config/interaggregate.xml
+%%DATADIR%%/config/interference.xml
+%%DATADIR%%/config/intermomentary.xml
+%%DATADIR%%/config/jigglypuff.xml
+%%DATADIR%%/config/jigsaw.xml
+%%DATADIR%%/config/juggle.xml
+%%DATADIR%%/config/julia.xml
+%%DATADIR%%/config/kaleidescope.xml
+%%DATADIR%%/config/klein.xml
+%%DATADIR%%/config/kumppa.xml
+%%DATADIR%%/config/lament.xml
+%%DATADIR%%/config/laser.xml
+%%DATADIR%%/config/lavalite.xml
+%%DATADIR%%/config/lightning.xml
+%%DATADIR%%/config/lisa.xml
+%%DATADIR%%/config/lissie.xml
+%%DATADIR%%/config/lmorph.xml
+%%DATADIR%%/config/loop.xml
+%%DATADIR%%/config/maze.xml
+%%DATADIR%%/config/memscroller.xml
+%%DATADIR%%/config/menger.xml
+%%DATADIR%%/config/metaballs.xml
+%%DATADIR%%/config/mirrorblob.xml
+%%DATADIR%%/config/mismunch.xml
+%%DATADIR%%/config/moebius.xml
+%%DATADIR%%/config/moire.xml
+%%DATADIR%%/config/moire2.xml
+%%DATADIR%%/config/molecule.xml
+%%DATADIR%%/config/morph3d.xml
+%%DATADIR%%/config/mountain.xml
+%%DATADIR%%/config/munch.xml
+%%DATADIR%%/config/nerverot.xml
+%%DATADIR%%/config/noof.xml
+%%DATADIR%%/config/noseguy.xml
+%%DATADIR%%/config/pacman.xml
+%%DATADIR%%/config/pedal.xml
+%%DATADIR%%/config/penetrate.xml
+%%DATADIR%%/config/penrose.xml
+%%DATADIR%%/config/petri.xml
+%%DATADIR%%/config/phosphor.xml
+%%DATADIR%%/config/piecewise.xml
+%%DATADIR%%/config/pinion.xml
+%%DATADIR%%/config/pipes.xml
+%%DATADIR%%/config/polyhedra.xml
+%%DATADIR%%/config/polyominoes.xml
+%%DATADIR%%/config/polytopes.xml
+%%DATADIR%%/config/pong.xml
+%%DATADIR%%/config/popsquares.xml
+%%DATADIR%%/config/providence.xml
+%%DATADIR%%/config/pulsar.xml
+%%DATADIR%%/config/pyro.xml
+%%DATADIR%%/config/qix.xml
+%%DATADIR%%/config/queens.xml
+%%DATADIR%%/config/rd-bomb.xml
+%%DATADIR%%/config/ripples.xml
+%%DATADIR%%/config/rocks.xml
+%%DATADIR%%/config/rorschach.xml
+%%DATADIR%%/config/rotor.xml
+%%DATADIR%%/config/rotzoomer.xml
+%%DATADIR%%/config/rubik.xml
+%%DATADIR%%/config/sballs.xml
+%%DATADIR%%/config/shadebobs.xml
+%%DATADIR%%/config/sierpinski.xml
+%%DATADIR%%/config/sierpinski3d.xml
+%%DATADIR%%/config/slidescreen.xml
+%%DATADIR%%/config/slip.xml
+%%DATADIR%%/config/sonar.xml
+%%DATADIR%%/config/speedmine.xml
+%%DATADIR%%/config/sphere.xml
+%%DATADIR%%/config/spheremonics.xml
+%%DATADIR%%/config/spiral.xml
+%%DATADIR%%/config/spotlight.xml
+%%DATADIR%%/config/sproingies.xml
+%%DATADIR%%/config/squiral.xml
+%%DATADIR%%/config/stairs.xml
+%%DATADIR%%/config/starfish.xml
+%%DATADIR%%/config/starwars.xml
+%%DATADIR%%/config/stonerview.xml
+%%DATADIR%%/config/strange.xml
+%%DATADIR%%/config/substrate.xml
+%%DATADIR%%/config/superquadrics.xml
+%%DATADIR%%/config/swirl.xml
+%%DATADIR%%/config/t3d.xml
+%%DATADIR%%/config/tangram.xml
+%%DATADIR%%/config/thornbird.xml
+%%DATADIR%%/config/triangle.xml
+%%DATADIR%%/config/truchet.xml
+%%DATADIR%%/config/twang.xml
+%%DATADIR%%/config/vermiculate.xml
+%%DATADIR%%/config/vidwhacker.xml
+%%DATADIR%%/config/vines.xml
+%%DATADIR%%/config/wander.xml
+%%DATADIR%%/config/webcollage.xml
+%%DATADIR%%/config/whirlwindwarp.xml
+%%DATADIR%%/config/whirlygig.xml
+%%DATADIR%%/config/worm.xml
+%%DATADIR%%/config/wormhole.xml
+%%DATADIR%%/config/xanalogtv.xml
+%%DATADIR%%/config/xflame.xml
+%%DATADIR%%/config/xjack.xml
+%%DATADIR%%/config/xlyap.xml
+%%DATADIR%%/config/xmatrix.xml
+%%DATADIR%%/config/xrayswarm.xml
+%%DATADIR%%/config/xspirograph.xml
+%%DATADIR%%/config/xteevee.xml
+%%DATADIR%%/config/zoom.xml
+%%DATADIR%%/glade/screensaver-cmndln.png
+%%DATADIR%%/glade/screensaver-colorselector.png
+%%DATADIR%%/glade/screensaver-diagnostic.png
+%%DATADIR%%/glade/screensaver-locking.png
+%%DATADIR%%/glade/screensaver-power.png
+%%DATADIR%%/glade/screensaver-snap.png
+%%DATADIR%%/glade/xscreensaver-demo.glade2
 @dirrm bin/xscreensaver-hacks
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%