xscreensaver: fix build without opengl option.

Noted by Mayuresh on pkgsrc-users.

2 files changed, 56 insertions, 322 deletions

diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index df4ab0d8b7f..47a1c91066f 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,140 +1,73 @@
-@comment $NetBSD: PLIST,v 1.45 2017/08/16 07:33:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.46 2018/06/24 05:51:58 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
-bin/xscreensaver-gl-helper
 bin/xscreensaver-text
 lib/X11/app-defaults/XScreenSaver
 libexec/xscreensaver/abstractile
 libexec/xscreensaver/anemone
 libexec/xscreensaver/anemotaxis
-libexec/xscreensaver/antinspect
-libexec/xscreensaver/antmaze
-libexec/xscreensaver/antspotlight
 libexec/xscreensaver/apollonian
 libexec/xscreensaver/apple2
-libexec/xscreensaver/atlantis
 libexec/xscreensaver/attraction
-libexec/xscreensaver/atunnel
 libexec/xscreensaver/barcode
 libexec/xscreensaver/binaryring
 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/bumps
-libexec/xscreensaver/cage
-libexec/xscreensaver/carousel
 libexec/xscreensaver/ccurve
 libexec/xscreensaver/celtic
-libexec/xscreensaver/circuit
-libexec/xscreensaver/cityflow
 libexec/xscreensaver/cloudlife
-libexec/xscreensaver/companioncube
 libexec/xscreensaver/compass
 libexec/xscreensaver/config/README
 libexec/xscreensaver/config/abstractile.xml
 libexec/xscreensaver/config/anemone.xml
 libexec/xscreensaver/config/anemotaxis.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
-libexec/xscreensaver/config/atlantis.xml
 libexec/xscreensaver/config/attraction.xml
-libexec/xscreensaver/config/atunnel.xml
 libexec/xscreensaver/config/barcode.xml
 libexec/xscreensaver/config/binaryring.xml
 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/bumps.xml
-libexec/xscreensaver/config/cage.xml
-libexec/xscreensaver/config/carousel.xml
 libexec/xscreensaver/config/ccurve.xml
 libexec/xscreensaver/config/celtic.xml
-libexec/xscreensaver/config/circuit.xml
-libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/cloudlife.xml
-libexec/xscreensaver/config/companioncube.xml
 libexec/xscreensaver/config/compass.xml
 libexec/xscreensaver/config/coral.xml
-libexec/xscreensaver/config/crackberg.xml
 libexec/xscreensaver/config/crystal.xml
-libexec/xscreensaver/config/cube21.xml
-libexec/xscreensaver/config/cubenetic.xml
-libexec/xscreensaver/config/cubestack.xml
-libexec/xscreensaver/config/cubestorm.xml
-libexec/xscreensaver/config/cubetwist.xml
-libexec/xscreensaver/config/cubicgrid.xml
 libexec/xscreensaver/config/cwaves.xml
 libexec/xscreensaver/config/cynosure.xml
-libexec/xscreensaver/config/dangerball.xml
 libexec/xscreensaver/config/decayscreen.xml
 libexec/xscreensaver/config/deco.xml
 libexec/xscreensaver/config/deluxe.xml
 libexec/xscreensaver/config/demon.xml
-libexec/xscreensaver/config/discoball.xml
 libexec/xscreensaver/config/discrete.xml
 libexec/xscreensaver/config/distort.xml
 libexec/xscreensaver/config/drift.xml
-libexec/xscreensaver/config/dymaxionmap.xml
-libexec/xscreensaver/config/endgame.xml
-libexec/xscreensaver/config/energystream.xml
-libexec/xscreensaver/config/engine.xml
 libexec/xscreensaver/config/epicycle.xml
 libexec/xscreensaver/config/eruption.xml
 libexec/xscreensaver/config/euler2d.xml
-libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/fadeplot.xml
 libexec/xscreensaver/config/fiberlamp.xml
 libexec/xscreensaver/config/fireworkx.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
-libexec/xscreensaver/config/flyingtoasters.xml
 libexec/xscreensaver/config/fontglide.xml
 libexec/xscreensaver/config/fuzzyflakes.xml
 libexec/xscreensaver/config/galaxy.xml
-libexec/xscreensaver/config/gears.xml
-libexec/xscreensaver/config/geodesic.xml
-libexec/xscreensaver/config/geodesicgears.xml
-libexec/xscreensaver/config/gflux.xml
-libexec/xscreensaver/config/glblur.xml
-libexec/xscreensaver/config/glcells.xml
-libexec/xscreensaver/config/gleidescope.xml
-libexec/xscreensaver/config/glhanoi.xml
-libexec/xscreensaver/config/glknots.xml
-libexec/xscreensaver/config/glmatrix.xml
-libexec/xscreensaver/config/glplanet.xml
-libexec/xscreensaver/config/glschool.xml
-libexec/xscreensaver/config/glslideshow.xml
-libexec/xscreensaver/config/glsnake.xml
-libexec/xscreensaver/config/gltext.xml
 libexec/xscreensaver/config/goop.xml
 libexec/xscreensaver/config/grav.xml
 libexec/xscreensaver/config/greynetic.xml
@@ -142,46 +75,26 @@ libexec/xscreensaver/config/halftone.xml
 libexec/xscreensaver/config/halo.xml
 libexec/xscreensaver/config/helix.xml
 libexec/xscreensaver/config/hexadrop.xml
-libexec/xscreensaver/config/hexstrut.xml
-libexec/xscreensaver/config/hilbert.xml
 libexec/xscreensaver/config/hopalong.xml
-libexec/xscreensaver/config/hydrostat.xml
-libexec/xscreensaver/config/hypertorus.xml
-libexec/xscreensaver/config/hypnowheel.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
-libexec/xscreensaver/config/jigsaw.xml
-libexec/xscreensaver/config/juggler3d.xml
 libexec/xscreensaver/config/julia.xml
 libexec/xscreensaver/config/kaleidescope.xml
-libexec/xscreensaver/config/kaleidocycle.xml
-libexec/xscreensaver/config/klein.xml
 libexec/xscreensaver/config/kumppa.xml
-libexec/xscreensaver/config/lament.xml
-libexec/xscreensaver/config/lavalite.xml
 libexec/xscreensaver/config/lcdscrub.xml
-libexec/xscreensaver/config/lockward.xml
 libexec/xscreensaver/config/loop.xml
 libexec/xscreensaver/config/m6502.xml
 libexec/xscreensaver/config/maze.xml
 libexec/xscreensaver/config/memscroller.xml
-libexec/xscreensaver/config/menger.xml
 libexec/xscreensaver/config/metaballs.xml
-libexec/xscreensaver/config/mirrorblob.xml
-libexec/xscreensaver/config/moebius.xml
-libexec/xscreensaver/config/moebiusgears.xml
 libexec/xscreensaver/config/moire.xml
 libexec/xscreensaver/config/moire2.xml
-libexec/xscreensaver/config/molecule.xml
-libexec/xscreensaver/config/morph3d.xml
 libexec/xscreensaver/config/mountain.xml
 libexec/xscreensaver/config/munch.xml
 libexec/xscreensaver/config/nerverot.xml
-libexec/xscreensaver/config/noof.xml
 libexec/xscreensaver/config/noseguy.xml
 libexec/xscreensaver/config/pacman.xml
 libexec/xscreensaver/config/pedal.xml
@@ -189,73 +102,37 @@ 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
-libexec/xscreensaver/config/polyhedra.xml
 libexec/xscreensaver/config/polyominoes.xml
-libexec/xscreensaver/config/polytopes.xml
 libexec/xscreensaver/config/pong.xml
 libexec/xscreensaver/config/popsquares.xml
-libexec/xscreensaver/config/projectiveplane.xml
-libexec/xscreensaver/config/providence.xml
-libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/pyro.xml
 libexec/xscreensaver/config/qix.xml
-libexec/xscreensaver/config/quasicrystal.xml
-libexec/xscreensaver/config/queens.xml
-libexec/xscreensaver/config/raverhoop.xml
 libexec/xscreensaver/config/rd-bomb.xml
 libexec/xscreensaver/config/ripples.xml
 libexec/xscreensaver/config/rocks.xml
-libexec/xscreensaver/config/romanboy.xml
 libexec/xscreensaver/config/rorschach.xml
 libexec/xscreensaver/config/rotzoomer.xml
-libexec/xscreensaver/config/rubik.xml
-libexec/xscreensaver/config/rubikblocks.xml
-libexec/xscreensaver/config/sballs.xml
 libexec/xscreensaver/config/shadebobs.xml
 libexec/xscreensaver/config/sierpinski.xml
-libexec/xscreensaver/config/sierpinski3d.xml
-libexec/xscreensaver/config/skytentacles.xml
 libexec/xscreensaver/config/slidescreen.xml
 libexec/xscreensaver/config/slip.xml
-libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/speedmine.xml
-libexec/xscreensaver/config/spheremonics.xml
-libexec/xscreensaver/config/splitflap.xml
-libexec/xscreensaver/config/splodesic.xml
 libexec/xscreensaver/config/spotlight.xml
-libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/squiral.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/surfaces.xml
 libexec/xscreensaver/config/swirl.xml
-libexec/xscreensaver/config/tangram.xml
 libexec/xscreensaver/config/tessellimage.xml
 libexec/xscreensaver/config/thornbird.xml
-libexec/xscreensaver/config/timetunnel.xml
-libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/triangle.xml
-libexec/xscreensaver/config/tronbit.xml
 libexec/xscreensaver/config/truchet.xml
 libexec/xscreensaver/config/twang.xml
-libexec/xscreensaver/config/unicrud.xml
-libexec/xscreensaver/config/unknownpleasures.xml
 libexec/xscreensaver/config/vermiculate.xml
 libexec/xscreensaver/config/vidwhacker.xml
-libexec/xscreensaver/config/vigilance.xml
-libexec/xscreensaver/config/voronoi.xml
 libexec/xscreensaver/config/wander.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
-libexec/xscreensaver/config/winduprobot.xml
 libexec/xscreensaver/config/wormhole.xml
 libexec/xscreensaver/config/xanalogtv.xml
 libexec/xscreensaver/config/xflame.xml
@@ -266,62 +143,28 @@ libexec/xscreensaver/config/xrayswarm.xml
 libexec/xscreensaver/config/xspirograph.xml
 libexec/xscreensaver/config/zoom.xml
 libexec/xscreensaver/coral
-libexec/xscreensaver/crackberg
 libexec/xscreensaver/crystal
-libexec/xscreensaver/cube21
-libexec/xscreensaver/cubenetic
-libexec/xscreensaver/cubestack
-libexec/xscreensaver/cubestorm
-libexec/xscreensaver/cubetwist
-libexec/xscreensaver/cubicgrid
 libexec/xscreensaver/cwaves
 libexec/xscreensaver/cynosure
-libexec/xscreensaver/dangerball
 libexec/xscreensaver/decayscreen
 libexec/xscreensaver/deco
 libexec/xscreensaver/deluxe
 libexec/xscreensaver/demon
-libexec/xscreensaver/discoball
 libexec/xscreensaver/discrete
 libexec/xscreensaver/distort
 libexec/xscreensaver/drift
-libexec/xscreensaver/dymaxionmap
-libexec/xscreensaver/endgame
-libexec/xscreensaver/energystream
-libexec/xscreensaver/engine
 libexec/xscreensaver/epicycle
 libexec/xscreensaver/eruption
 libexec/xscreensaver/euler2d
-libexec/xscreensaver/extrusion
 libexec/xscreensaver/fadeplot
 libexec/xscreensaver/fiberlamp
 libexec/xscreensaver/fireworkx
 libexec/xscreensaver/flame
-libexec/xscreensaver/flipflop
-libexec/xscreensaver/flipscreen3d
-libexec/xscreensaver/fliptext
 libexec/xscreensaver/flow
 libexec/xscreensaver/fluidballs
-libexec/xscreensaver/flurry
-libexec/xscreensaver/flyingtoasters
 libexec/xscreensaver/fontglide
 libexec/xscreensaver/fuzzyflakes
 libexec/xscreensaver/galaxy
-libexec/xscreensaver/gears
-libexec/xscreensaver/geodesic
-libexec/xscreensaver/geodesicgears
-libexec/xscreensaver/gflux
-libexec/xscreensaver/glblur
-libexec/xscreensaver/glcells
-libexec/xscreensaver/gleidescope
-libexec/xscreensaver/glhanoi
-libexec/xscreensaver/glknots
-libexec/xscreensaver/glmatrix
-libexec/xscreensaver/glplanet
-libexec/xscreensaver/glschool
-libexec/xscreensaver/glslideshow
-libexec/xscreensaver/glsnake
-libexec/xscreensaver/gltext
 libexec/xscreensaver/goop
 libexec/xscreensaver/grav
 libexec/xscreensaver/greynetic
@@ -329,47 +172,27 @@ libexec/xscreensaver/halftone
 libexec/xscreensaver/halo
 libexec/xscreensaver/helix
 libexec/xscreensaver/hexadrop
-libexec/xscreensaver/hexstrut
-libexec/xscreensaver/hilbert
 libexec/xscreensaver/hopalong
-libexec/xscreensaver/hydrostat
-libexec/xscreensaver/hypertorus
-libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/ifs
 libexec/xscreensaver/imsmap
 libexec/xscreensaver/interaggregate
 libexec/xscreensaver/interference
 libexec/xscreensaver/intermomentary
-libexec/xscreensaver/jigglypuff
-libexec/xscreensaver/jigsaw
-libexec/xscreensaver/juggler3d
 libexec/xscreensaver/julia
 libexec/xscreensaver/kaleidescope
-libexec/xscreensaver/kaleidocycle
-libexec/xscreensaver/klein
 libexec/xscreensaver/kumppa
-libexec/xscreensaver/lament
-libexec/xscreensaver/lavalite
 libexec/xscreensaver/lcdscrub
 libexec/xscreensaver/ljlatest
-libexec/xscreensaver/lockward
 libexec/xscreensaver/loop
 libexec/xscreensaver/m6502
 libexec/xscreensaver/maze
 libexec/xscreensaver/memscroller
-libexec/xscreensaver/menger
 libexec/xscreensaver/metaballs
-libexec/xscreensaver/mirrorblob
-libexec/xscreensaver/moebius
-libexec/xscreensaver/moebiusgears
 libexec/xscreensaver/moire
 libexec/xscreensaver/moire2
-libexec/xscreensaver/molecule
-libexec/xscreensaver/morph3d
 libexec/xscreensaver/mountain
 libexec/xscreensaver/munch
 libexec/xscreensaver/nerverot
-libexec/xscreensaver/noof
 libexec/xscreensaver/noseguy
 libexec/xscreensaver/pacman
 libexec/xscreensaver/pedal
@@ -377,73 +200,37 @@ libexec/xscreensaver/penetrate
 libexec/xscreensaver/penrose
 libexec/xscreensaver/petri
 libexec/xscreensaver/phosphor
-libexec/xscreensaver/photopile
 libexec/xscreensaver/piecewise
-libexec/xscreensaver/pinion
-libexec/xscreensaver/pipes
-libexec/xscreensaver/polyhedra
 libexec/xscreensaver/polyominoes
-libexec/xscreensaver/polytopes
 libexec/xscreensaver/pong
 libexec/xscreensaver/popsquares
-libexec/xscreensaver/projectiveplane
-libexec/xscreensaver/providence
-libexec/xscreensaver/pulsar
 libexec/xscreensaver/pyro
 libexec/xscreensaver/qix
-libexec/xscreensaver/quasicrystal
-libexec/xscreensaver/queens
-libexec/xscreensaver/raverhoop
 libexec/xscreensaver/rd-bomb
 libexec/xscreensaver/ripples
 libexec/xscreensaver/rocks
-libexec/xscreensaver/romanboy
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotzoomer
-libexec/xscreensaver/rubik
-libexec/xscreensaver/rubikblocks
-libexec/xscreensaver/sballs
 libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
-libexec/xscreensaver/sierpinski3d
-libexec/xscreensaver/skytentacles
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
-libexec/xscreensaver/sonar
 libexec/xscreensaver/speedmine
-libexec/xscreensaver/spheremonics
-libexec/xscreensaver/splitflap
-libexec/xscreensaver/splodesic
 libexec/xscreensaver/spotlight
-libexec/xscreensaver/sproingies
 libexec/xscreensaver/squiral
-libexec/xscreensaver/stairs
 libexec/xscreensaver/starfish
-libexec/xscreensaver/starwars
-libexec/xscreensaver/stonerview
 libexec/xscreensaver/strange
 libexec/xscreensaver/substrate
-libexec/xscreensaver/superquadrics
-libexec/xscreensaver/surfaces
 libexec/xscreensaver/swirl
-libexec/xscreensaver/tangram
 libexec/xscreensaver/tessellimage
 libexec/xscreensaver/thornbird
-libexec/xscreensaver/timetunnel
-libexec/xscreensaver/topblock
 libexec/xscreensaver/triangle
-libexec/xscreensaver/tronbit
 libexec/xscreensaver/truchet
 libexec/xscreensaver/twang
-libexec/xscreensaver/unicrud
-libexec/xscreensaver/unknownpleasures
 libexec/xscreensaver/vermiculate
 libexec/xscreensaver/vidwhacker
-libexec/xscreensaver/vigilance
-libexec/xscreensaver/voronoi
 libexec/xscreensaver/wander
 libexec/xscreensaver/whirlwindwarp
-libexec/xscreensaver/winduprobot
 libexec/xscreensaver/wormhole
 libexec/xscreensaver/xanalogtv
 libexec/xscreensaver/xflame
@@ -462,95 +249,45 @@ man/man1/xscreensaver.1
 man/man6/abstractile.6
 man/man6/anemone.6
 man/man6/anemotaxis.6
-man/man6/antinspect.6
-man/man6/antmaze.6
-man/man6/antspotlight.6
 man/man6/apollonian.6
 man/man6/apple2.6
-man/man6/atlantis.6
 man/man6/attraction.6
-man/man6/atunnel.6
 man/man6/barcode.6
 man/man6/binaryring.6
 man/man6/blaster.6
-man/man6/blinkbox.6
 man/man6/blitspin.6
-man/man6/blocktube.6
-man/man6/boing.6
 man/man6/bouboule.6
-man/man6/bouncingcow.6
-man/man6/boxed.6
 man/man6/boxfit.6
 man/man6/braid.6
 man/man6/bsod.6
-man/man6/bubble3d.6
 man/man6/bumps.6
-man/man6/cage.6
-man/man6/carousel.6
 man/man6/ccurve.6
 man/man6/celtic.6
-man/man6/circuit.6
-man/man6/cityflow.6
 man/man6/cloudlife.6
-man/man6/companioncube.6
 man/man6/compass.6
 man/man6/coral.6
-man/man6/crackberg.6
 man/man6/crystal.6
-man/man6/cube21.6
-man/man6/cubenetic.6
-man/man6/cubestack.6
-man/man6/cubestorm.6
-man/man6/cubetwist.6
-man/man6/cubicgrid.6
 man/man6/cwaves.6
 man/man6/cynosure.6
-man/man6/dangerball.6
 man/man6/decayscreen.6
 man/man6/deco.6
 man/man6/deluxe.6
 man/man6/demon.6
-man/man6/discoball.6
 man/man6/discrete.6
 man/man6/distort.6
 man/man6/drift.6
-man/man6/dymaxionmap.6
-man/man6/endgame.6
-man/man6/energystream.6
-man/man6/engine.6
 man/man6/epicycle.6
 man/man6/eruption.6
 man/man6/euler2d.6
-man/man6/extrusion.6
 man/man6/fadeplot.6
 man/man6/fiberlamp.6
 man/man6/fireworkx.6
 man/man6/flame.6
-man/man6/flipflop.6
-man/man6/flipscreen3d.6
-man/man6/fliptext.6
 man/man6/flow.6
 man/man6/fluidballs.6
-man/man6/flurry.6
-man/man6/flyingtoasters.6
 man/man6/fontglide.6
 man/man6/fuzzyflakes.6
 man/man6/galaxy.6
-man/man6/gears.6
-man/man6/geodesic.6
-man/man6/geodesicgears.6
-man/man6/gflux.6
-man/man6/glblur.6
-man/man6/glcells.6
-man/man6/gleidescope.6
-man/man6/glhanoi.6
-man/man6/glknots.6
-man/man6/glmatrix.6
-man/man6/glplanet.6
-man/man6/glschool.6
-man/man6/glslideshow.6
-man/man6/glsnake.6
-man/man6/gltext.6
 man/man6/goop.6
 man/man6/grav.6
 man/man6/greynetic.6
@@ -558,46 +295,26 @@ man/man6/halftone.6
 man/man6/halo.6
 man/man6/helix.6
 man/man6/hexadrop.6
-man/man6/hexstrut.6
-man/man6/hilbert.6
 man/man6/hopalong.6
-man/man6/hydrostat.6
-man/man6/hypertorus.6
-man/man6/hypnowheel.6
 man/man6/ifs.6
 man/man6/imsmap.6
 man/man6/interaggregate.6
 man/man6/interference.6
 man/man6/intermomentary.6
-man/man6/jigglypuff.6
-man/man6/jigsaw.6
-man/man6/juggler3d.6
 man/man6/julia.6
 man/man6/kaleidescope.6
-man/man6/kaleidocycle.6
-man/man6/klein.6
 man/man6/kumppa.6
-man/man6/lament.6
-man/man6/lavalite.6
 man/man6/lcdscrub.6
 man/man6/ljlatest.6
-man/man6/lockward.6
 man/man6/loop.6
 man/man6/maze.6
 man/man6/memscroller.6
-man/man6/menger.6
 man/man6/metaballs.6
-man/man6/mirrorblob.6
-man/man6/moebius.6
-man/man6/moebiusgears.6
 man/man6/moire.6
 man/man6/moire2.6
-man/man6/molecule.6
-man/man6/morph3d.6
 man/man6/mountain.6
 man/man6/munch.6
 man/man6/nerverot.6
-man/man6/noof.6
 man/man6/noseguy.6
 man/man6/pacman.6
 man/man6/pedal.6
@@ -605,72 +322,36 @@ 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
-man/man6/polyhedra.6
 man/man6/polyominoes.6
-man/man6/polytopes.6
 man/man6/pong.6
-man/man6/projectiveplane.6
-man/man6/providence.6
-man/man6/pulsar.6
 man/man6/pyro.6
 man/man6/qix.6
-man/man6/quasicrystal.6
-man/man6/queens.6
-man/man6/raverhoop.6
 man/man6/rd-bomb.6
 man/man6/ripples.6
 man/man6/rocks.6
-man/man6/romanboy.6
 man/man6/rorschach.6
 man/man6/rotzoomer.6
-man/man6/rubik.6
-man/man6/rubikblocks.6
-man/man6/sballs.6
 man/man6/shadebobs.6
 man/man6/sierpinski.6
-man/man6/sierpinski3d.6
-man/man6/skytentacles.6
 man/man6/slidescreen.6
 man/man6/slip.6
-man/man6/sonar.6
 man/man6/speedmine.6
-man/man6/spheremonics.6
-man/man6/splitflap.6
-man/man6/splodesic.6
 man/man6/spotlight.6
-man/man6/sproingies.6
 man/man6/squiral.6
-man/man6/stairs.6
 man/man6/starfish.6
-man/man6/starwars.6
-man/man6/stonerview.6
 man/man6/strange.6
 man/man6/substrate.6
-man/man6/superquadrics.6
-man/man6/surfaces.6
 man/man6/swirl.6
-man/man6/tangram.6
 man/man6/tessellimage.6
 man/man6/thornbird.6
-man/man6/timetunnel.6
-man/man6/topblock.6
 man/man6/triangle.6
-man/man6/tronbit.6
 man/man6/truchet.6
 man/man6/twang.6
-man/man6/unicrud.6
-man/man6/unknownpleasures.6
 man/man6/vermiculate.6
 man/man6/vidwhacker.6
-man/man6/vigilance.6
-man/man6/voronoi.6
 man/man6/wander.6
 man/man6/whirlwindwarp.6
-man/man6/winduprobot.6
 man/man6/wormhole.6
 man/man6/xanalogtv.6
 man/man6/xflame.6
@@ -678,7 +359,6 @@ man/man6/xjack.6
 man/man6/xlyap.6
 man/man6/xmatrix.6
 man/man6/xrayswarm.6
-man/man6/xscreensaver-gl-helper.6
 man/man6/xspirograph.6
 man/man6/zoom.6
 share/examples/xscreensaver/pam.d/xscreensaver-NetBSD
diff --git a/x11/xscreensaver/PLIST.opengl b/x11/xscreensaver/PLIST.opengl
index 3e081811812..e3f1a150ed0 100644
--- a/x11/xscreensaver/PLIST.opengl
+++ b/x11/xscreensaver/PLIST.opengl
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opengl,v 1.3 2013/07/22 14:24:17 drochner Exp $
+@comment $NetBSD: PLIST.opengl,v 1.4 2018/06/24 05:51:58 wiz Exp $
 bin/xscreensaver-gl-helper
 libexec/xscreensaver/antinspect
 libexec/xscreensaver/antmaze
@@ -14,6 +14,7 @@ libexec/xscreensaver/bubble3d
 libexec/xscreensaver/cage
 libexec/xscreensaver/carousel
 libexec/xscreensaver/circuit
+libexec/xscreensaver/cityflow
 libexec/xscreensaver/companioncube
 libexec/xscreensaver/config/antinspect.xml
 libexec/xscreensaver/config/antmaze.xml
@@ -29,14 +30,20 @@ libexec/xscreensaver/config/bubble3d.xml
 libexec/xscreensaver/config/cage.xml
 libexec/xscreensaver/config/carousel.xml
 libexec/xscreensaver/config/circuit.xml
+libexec/xscreensaver/config/cityflow.xml
 libexec/xscreensaver/config/companioncube.xml
 libexec/xscreensaver/config/crackberg.xml
 libexec/xscreensaver/config/cube21.xml
 libexec/xscreensaver/config/cubenetic.xml
+libexec/xscreensaver/config/cubestack.xml
 libexec/xscreensaver/config/cubestorm.xml
+libexec/xscreensaver/config/cubetwist.xml
 libexec/xscreensaver/config/cubicgrid.xml
 libexec/xscreensaver/config/dangerball.xml
+libexec/xscreensaver/config/discoball.xml
+libexec/xscreensaver/config/dymaxionmap.xml
 libexec/xscreensaver/config/endgame.xml
+libexec/xscreensaver/config/energystream.xml
 libexec/xscreensaver/config/engine.xml
 libexec/xscreensaver/config/extrusion.xml
 libexec/xscreensaver/config/flipflop.xml
@@ -45,6 +52,8 @@ libexec/xscreensaver/config/fliptext.xml
 libexec/xscreensaver/config/flurry.xml
 libexec/xscreensaver/config/flyingtoasters.xml
 libexec/xscreensaver/config/gears.xml
+libexec/xscreensaver/config/geodesic.xml
+libexec/xscreensaver/config/geodesicgears.xml
 libexec/xscreensaver/config/gflux.xml
 libexec/xscreensaver/config/glblur.xml
 libexec/xscreensaver/config/glcells.xml
@@ -57,7 +66,9 @@ libexec/xscreensaver/config/glschool.xml
 libexec/xscreensaver/config/glslideshow.xml
 libexec/xscreensaver/config/glsnake.xml
 libexec/xscreensaver/config/gltext.xml
+libexec/xscreensaver/config/hexstrut.xml
 libexec/xscreensaver/config/hilbert.xml
+libexec/xscreensaver/config/hydrostat.xml
 libexec/xscreensaver/config/hypertorus.xml
 libexec/xscreensaver/config/hypnowheel.xml
 libexec/xscreensaver/config/jigglypuff.xml
@@ -80,10 +91,13 @@ libexec/xscreensaver/config/pinion.xml
 libexec/xscreensaver/config/pipes.xml
 libexec/xscreensaver/config/polyhedra.xml
 libexec/xscreensaver/config/polytopes.xml
+libexec/xscreensaver/config/projectiveplane.xml
 libexec/xscreensaver/config/providence.xml
 libexec/xscreensaver/config/pulsar.xml
 libexec/xscreensaver/config/quasicrystal.xml
 libexec/xscreensaver/config/queens.xml
+libexec/xscreensaver/config/raverhoop.xml
+libexec/xscreensaver/config/romanboy.xml
 libexec/xscreensaver/config/rubik.xml
 libexec/xscreensaver/config/rubikblocks.xml
 libexec/xscreensaver/config/sballs.xml
@@ -91,6 +105,8 @@ libexec/xscreensaver/config/sierpinski3d.xml
 libexec/xscreensaver/config/skytentacles.xml
 libexec/xscreensaver/config/sonar.xml
 libexec/xscreensaver/config/spheremonics.xml
+libexec/xscreensaver/config/splitflap.xml
+libexec/xscreensaver/config/splodesic.xml
 libexec/xscreensaver/config/sproingies.xml
 libexec/xscreensaver/config/stairs.xml
 libexec/xscreensaver/config/starwars.xml
@@ -101,15 +117,23 @@ libexec/xscreensaver/config/tangram.xml
 libexec/xscreensaver/config/timetunnel.xml
 libexec/xscreensaver/config/topblock.xml
 libexec/xscreensaver/config/tronbit.xml
+libexec/xscreensaver/config/unicrud.xml
 libexec/xscreensaver/config/unknownpleasures.xml
+libexec/xscreensaver/config/vigilance.xml
 libexec/xscreensaver/config/voronoi.xml
+libexec/xscreensaver/config/winduprobot.xml
 libexec/xscreensaver/crackberg
 libexec/xscreensaver/cube21
 libexec/xscreensaver/cubenetic
+libexec/xscreensaver/cubestack
 libexec/xscreensaver/cubestorm
+libexec/xscreensaver/cubetwist
 libexec/xscreensaver/cubicgrid
 libexec/xscreensaver/dangerball
+libexec/xscreensaver/discoball
+libexec/xscreensaver/dymaxionmap
 libexec/xscreensaver/endgame
+libexec/xscreensaver/energystream
 libexec/xscreensaver/engine
 libexec/xscreensaver/extrusion
 libexec/xscreensaver/flipflop
@@ -118,6 +142,8 @@ libexec/xscreensaver/fliptext
 libexec/xscreensaver/flurry
 libexec/xscreensaver/flyingtoasters
 libexec/xscreensaver/gears
+libexec/xscreensaver/geodesic
+libexec/xscreensaver/geodesicgears
 libexec/xscreensaver/gflux
 libexec/xscreensaver/glblur
 libexec/xscreensaver/glcells
@@ -130,7 +156,9 @@ libexec/xscreensaver/glschool
 libexec/xscreensaver/glslideshow
 libexec/xscreensaver/glsnake
 libexec/xscreensaver/gltext
+libexec/xscreensaver/hexstrut
 libexec/xscreensaver/hilbert
+libexec/xscreensaver/hydrostat
 libexec/xscreensaver/hypertorus
 libexec/xscreensaver/hypnowheel
 libexec/xscreensaver/jigglypuff
@@ -153,10 +181,13 @@ libexec/xscreensaver/pinion
 libexec/xscreensaver/pipes
 libexec/xscreensaver/polyhedra
 libexec/xscreensaver/polytopes
+libexec/xscreensaver/projectiveplane
 libexec/xscreensaver/providence
 libexec/xscreensaver/pulsar
 libexec/xscreensaver/quasicrystal
 libexec/xscreensaver/queens
+libexec/xscreensaver/raverhoop
+libexec/xscreensaver/romanboy
 libexec/xscreensaver/rubik
 libexec/xscreensaver/rubikblocks
 libexec/xscreensaver/sballs
@@ -164,6 +195,8 @@ libexec/xscreensaver/sierpinski3d
 libexec/xscreensaver/skytentacles
 libexec/xscreensaver/sonar
 libexec/xscreensaver/spheremonics
+libexec/xscreensaver/splitflap
+libexec/xscreensaver/splodesic
 libexec/xscreensaver/sproingies
 libexec/xscreensaver/stairs
 libexec/xscreensaver/starwars
@@ -174,8 +207,11 @@ libexec/xscreensaver/tangram
 libexec/xscreensaver/timetunnel
 libexec/xscreensaver/topblock
 libexec/xscreensaver/tronbit
+libexec/xscreensaver/unicrud
 libexec/xscreensaver/unknownpleasures
+libexec/xscreensaver/vigilance
 libexec/xscreensaver/voronoi
+libexec/xscreensaver/winduprobot
 man/man6/antinspect.6
 man/man6/antmaze.6
 man/man6/antspotlight.6
@@ -190,14 +226,20 @@ man/man6/bubble3d.6
 man/man6/cage.6
 man/man6/carousel.6
 man/man6/circuit.6
+man/man6/cityflow.6
 man/man6/companioncube.6
 man/man6/crackberg.6
 man/man6/cube21.6
 man/man6/cubenetic.6
+man/man6/cubestack.6
 man/man6/cubestorm.6
+man/man6/cubetwist.6
 man/man6/cubicgrid.6
 man/man6/dangerball.6
+man/man6/discoball.6
+man/man6/dymaxionmap.6
 man/man6/endgame.6
+man/man6/energystream.6
 man/man6/engine.6
 man/man6/extrusion.6
 man/man6/flipflop.6
@@ -206,6 +248,8 @@ man/man6/fliptext.6
 man/man6/flurry.6
 man/man6/flyingtoasters.6
 man/man6/gears.6
+man/man6/geodesic.6
+man/man6/geodesicgears.6
 man/man6/gflux.6
 man/man6/glblur.6
 man/man6/glcells.6
@@ -218,7 +262,9 @@ man/man6/glschool.6
 man/man6/glslideshow.6
 man/man6/glsnake.6
 man/man6/gltext.6
+man/man6/hexstrut.6
 man/man6/hilbert.6
+man/man6/hydrostat.6
 man/man6/hypertorus.6
 man/man6/hypnowheel.6
 man/man6/jigglypuff.6
@@ -241,10 +287,13 @@ man/man6/pinion.6
 man/man6/pipes.6
 man/man6/polyhedra.6
 man/man6/polytopes.6
+man/man6/projectiveplane.6
 man/man6/providence.6
 man/man6/pulsar.6
 man/man6/quasicrystal.6
 man/man6/queens.6
+man/man6/raverhoop.6
+man/man6/romanboy.6
 man/man6/rubik.6
 man/man6/rubikblocks.6
 man/man6/sballs.6
@@ -252,6 +301,8 @@ man/man6/sierpinski3d.6
 man/man6/skytentacles.6
 man/man6/sonar.6
 man/man6/spheremonics.6
+man/man6/splitflap.6
+man/man6/splodesic.6
 man/man6/sproingies.6
 man/man6/stairs.6
 man/man6/starwars.6
@@ -262,6 +313,9 @@ man/man6/tangram.6
 man/man6/timetunnel.6
 man/man6/topblock.6
 man/man6/tronbit.6
+man/man6/unicrud.6
 man/man6/unknownpleasures.6
+man/man6/vigilance.6
 man/man6/voronoi.6
+man/man6/winduprobot.6
 man/man6/xscreensaver-gl-helper.6