2 files changed, 213 insertions, 9 deletions

diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index a0b94e243e16..0963b681f809 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -16,27 +16,30 @@ CONFLICTS=	xscreensaver-[0-9]* xscreensaver-gnome-[0-9]*
 OPTIONS_DEFINE=	ALL_FORTUNES
 ALL_FORTUNES_DESC=	Enable support for all fortunes
 
+USES=		shebangfix
+SHEBANG_FILES=	${SS_SCRIPTS:S,^,driver/,}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-nodriver
 
 SS_SCRIPTS=	xscreensaver-getimage-desktop xscreensaver-getimage-file \
-		xscreensaver-getimage xscreensaver-getimage-video \
+		xscreensaver-getimage-video \
 		xscreensaver-text
+SS_PROGRAMS=	xscreensaver-getimage
 
-MAN1=		xscreensaver-getimage-desktop.1 xscreensaver-getimage-file.1 \
-		xscreensaver-getimage-video.1 xscreensaver-getimage.1 \
-		xscreensaver-text.1
-
-NO_STAGE=	yes
 post-build:
 	@cd ${WRKSRC}/driver && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} xscreensaver-getimage
 
 post-install-slave:
-	${MKDIR} ${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
 .for sf in ${SS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/driver/${sf} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/driver/${sf} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/driver/${sf}.man \
+		${STAGEDIR}${MAN1PREFIX}/man/man1/${sf}.1
+.endfor
+.for sf in ${SS_PROGRAMS}
+	${INSTALL_PROGRAM} ${WRKSRC}/driver/${sf} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/driver/${sf}.man \
-		${MAN1PREFIX}/man/man1/${sf}.1
+		${STAGEDIR}${MAN1PREFIX}/man/man1/${sf}.1
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/xscreensaver-gnome-hacks/pkg-plist b/x11/xscreensaver-gnome-hacks/pkg-plist
index ea49ee270a32..f2bc87078e3f 100644
--- a/x11/xscreensaver-gnome-hacks/pkg-plist
+++ b/x11/xscreensaver-gnome-hacks/pkg-plist
@@ -201,6 +201,207 @@ bin/xscreensaver-hacks/xrayswarm
 bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
+man/man1/xscreensaver-getimage-desktop.1.gz
+man/man1/xscreensaver-getimage-file.1.gz
+man/man1/xscreensaver-getimage-video.1.gz
+man/man1/xscreensaver-getimage.1.gz
+man/man1/xscreensaver-text.1.gz
+man/man6/abstractile.6.gz
+man/man6/anemone.6.gz
+man/man6/anemotaxis.6.gz
+man/man6/antinspect.6.gz
+man/man6/antmaze.6.gz
+man/man6/antspotlight.6.gz
+man/man6/apollonian.6.gz
+man/man6/apple2.6.gz
+man/man6/atlantis.6.gz
+man/man6/attraction.6.gz
+man/man6/atunnel.6.gz
+man/man6/barcode.6.gz
+man/man6/blaster.6.gz
+man/man6/blinkbox.6.gz
+man/man6/blitspin.6.gz
+man/man6/blocktube.6.gz
+man/man6/boing.6.gz
+man/man6/bouboule.6.gz
+man/man6/bouncingcow.6.gz
+man/man6/boxed.6.gz
+man/man6/boxfit.6.gz
+man/man6/braid.6.gz
+man/man6/bsod.6.gz
+man/man6/bubble3d.6.gz
+man/man6/bumps.6.gz
+man/man6/cage.6.gz
+man/man6/carousel.6.gz
+man/man6/ccurve.6.gz
+man/man6/celtic.6.gz
+man/man6/circuit.6.gz
+man/man6/cloudlife.6.gz
+man/man6/compass.6.gz
+man/man6/coral.6.gz
+man/man6/crackberg.6.gz
+man/man6/crystal.6.gz
+man/man6/cube21.6.gz
+man/man6/cubenetic.6.gz
+man/man6/cubestorm.6.gz
+man/man6/cubicgrid.6.gz
+man/man6/cwaves.6.gz
+man/man6/cynosure.6.gz
+man/man6/dangerball.6.gz
+man/man6/decayscreen.6.gz
+man/man6/deco.6.gz
+man/man6/deluxe.6.gz
+man/man6/demon.6.gz
+man/man6/discrete.6.gz
+man/man6/distort.6.gz
+man/man6/drift.6.gz
+man/man6/endgame.6.gz
+man/man6/engine.6.gz
+man/man6/epicycle.6.gz
+man/man6/eruption.6.gz
+man/man6/euler2d.6.gz
+man/man6/extrusion.6.gz
+man/man6/fadeplot.6.gz
+man/man6/fiberlamp.6.gz
+man/man6/fireworkx.6.gz
+man/man6/flame.6.gz
+man/man6/flipflop.6.gz
+man/man6/flipscreen3d.6.gz
+man/man6/fliptext.6.gz
+man/man6/flow.6.gz
+man/man6/fluidballs.6.gz
+man/man6/flurry.6.gz
+man/man6/flyingtoasters.6.gz
+man/man6/fontglide.6.gz
+man/man6/fuzzyflakes.6.gz
+man/man6/galaxy.6.gz
+man/man6/gears.6.gz
+man/man6/gflux.6.gz
+man/man6/glblur.6.gz
+man/man6/glcells.6.gz
+man/man6/gleidescope.6.gz
+man/man6/glhanoi.6.gz
+man/man6/glknots.6.gz
+man/man6/glmatrix.6.gz
+man/man6/glplanet.6.gz
+man/man6/glschool.6.gz
+man/man6/glslideshow.6.gz
+man/man6/glsnake.6.gz
+man/man6/gltext.6.gz
+man/man6/goop.6.gz
+man/man6/grav.6.gz
+man/man6/greynetic.6.gz
+man/man6/halftone.6.gz
+man/man6/halo.6.gz
+man/man6/helix.6.gz
+man/man6/hopalong.6.gz
+man/man6/hypertorus.6.gz
+man/man6/hypnowheel.6.gz
+man/man6/ifs.6.gz
+man/man6/imsmap.6.gz
+man/man6/interaggregate.6.gz
+man/man6/interference.6.gz
+man/man6/intermomentary.6.gz
+man/man6/jigglypuff.6.gz
+man/man6/jigsaw.6.gz
+man/man6/juggler3d.6.gz
+man/man6/julia.6.gz
+man/man6/kaleidescope.6.gz
+man/man6/klein.6.gz
+man/man6/kumppa.6.gz
+man/man6/lament.6.gz
+man/man6/lavalite.6.gz
+man/man6/lcdscrub.6.gz
+man/man6/ljlatest.6.gz
+man/man6/lockward.6.gz
+man/man6/loop.6.gz
+man/man6/maze.6.gz
+man/man6/memscroller.6.gz
+man/man6/menger.6.gz
+man/man6/metaballs.6.gz
+man/man6/mirrorblob.6.gz
+man/man6/moebius.6.gz
+man/man6/moebiusgears.6.gz
+man/man6/moire.6.gz
+man/man6/moire2.6.gz
+man/man6/molecule.6.gz
+man/man6/morph3d.6.gz
+man/man6/mountain.6.gz
+man/man6/munch.6.gz
+man/man6/nerverot.6.gz
+man/man6/noof.6.gz
+man/man6/noseguy.6.gz
+man/man6/pacman.6.gz
+man/man6/pedal.6.gz
+man/man6/penetrate.6.gz
+man/man6/penrose.6.gz
+man/man6/petri.6.gz
+man/man6/phosphor.6.gz
+man/man6/photopile.6.gz
+man/man6/piecewise.6.gz
+man/man6/pinion.6.gz
+man/man6/pipes.6.gz
+man/man6/polyhedra.6.gz
+man/man6/polyominoes.6.gz
+man/man6/polytopes.6.gz
+man/man6/pong.6.gz
+man/man6/providence.6.gz
+man/man6/pulsar.6.gz
+man/man6/pyro.6.gz
+man/man6/qix.6.gz
+man/man6/queens.6.gz
+man/man6/rd-bomb.6.gz
+man/man6/ripples.6.gz
+man/man6/rocks.6.gz
+man/man6/rorschach.6.gz
+man/man6/rotzoomer.6.gz
+man/man6/rubik.6.gz
+man/man6/rubikblocks.6.gz
+man/man6/sballs.6.gz
+man/man6/shadebobs.6.gz
+man/man6/sierpinski.6.gz
+man/man6/sierpinski3d.6.gz
+man/man6/skytentacles.6.gz
+man/man6/slidescreen.6.gz
+man/man6/slip.6.gz
+man/man6/sonar.6.gz
+man/man6/speedmine.6.gz
+man/man6/spheremonics.6.gz
+man/man6/spotlight.6.gz
+man/man6/sproingies.6.gz
+man/man6/squiral.6.gz
+man/man6/stairs.6.gz
+man/man6/starfish.6.gz
+man/man6/starwars.6.gz
+man/man6/stonerview.6.gz
+man/man6/strange.6.gz
+man/man6/substrate.6.gz
+man/man6/superquadrics.6.gz
+man/man6/surfaces.6.gz
+man/man6/swirl.6.gz
+man/man6/tangram.6.gz
+man/man6/thornbird.6.gz
+man/man6/timetunnel.6.gz
+man/man6/topblock.6.gz
+man/man6/triangle.6.gz
+man/man6/truchet.6.gz
+man/man6/twang.6.gz
+man/man6/vermiculate.6.gz
+man/man6/vidwhacker.6.gz
+man/man6/voronoi.6.gz
+man/man6/wander.6.gz
+man/man6/webcollage.6.gz
+man/man6/whirlwindwarp.6.gz
+man/man6/wormhole.6.gz
+man/man6/xanalogtv.6.gz
+man/man6/xflame.6.gz
+man/man6/xjack.6.gz
+man/man6/xlyap.6.gz
+man/man6/xmatrix.6.gz
+man/man6/xrayswarm.6.gz
+man/man6/xscreensaver-gl-helper.6.gz
+man/man6/xspirograph.6.gz
+man/man6/zoom.6.gz
 share/xscreensaver/config/abstractile.xml
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml