- Argh, I totally missed post-install.. it's what creates the .desktop files,

  not gnome-screensaver.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6181 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 11 insertions, 207 deletions

diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 428e0939a..f243a34c2 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.38 2006/04/30 06:01:15 ahze Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.39 2006/04/30 18:51:04 ahze Exp $
 #
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.15.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -44,6 +44,15 @@ XSCREENSAVER_DIR=	${X11BASE}/share/xscreensaver/config
 BROKEN=	Does not build on 4.X
 .endif
 
+pre-install:
+	@${CP} ${.CURDIR}/pkg-plist ${PLIST}
+	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
+		${SED} -e 's:^:share/gnome/gnome-screensaver/themes/xscreensaver/:' | \
+		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
+	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes/xscreensaver >> ${PLIST}
+	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver/themes >> ${PLIST}
+	@${ECHO_CMD} @dirrm share/gnome/gnome-screensaver >> ${PLIST}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/configure
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index e42c86530..e544b7d31 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -15,208 +15,6 @@ share/gnome/applications/screensavers/popsquares.desktop
 share/gnome/desktop-directories/gnome-screensaver.directory
 share/gnome/gnome-screensaver/gnome-screensaver-preferences.glade
 share/gnome/gnome-screensaver/lock-dialog-default.glade
-share/gnome/gnome-screensaver/themes/xscreensaver/anemone.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/anemotaxis.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/antinspect.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/antmaze.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/antspotlight.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/apollonian.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/apple2.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/atlantis.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/attraction.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/atunnel.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/barcode.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/blaster.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/blinkbox.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/blitspin.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/blocktube.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/boing.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bouboule.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bouncingcow.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/boxed.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/boxfit.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/braid.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bsod.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bubble3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bubbles.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/bumps.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cage.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/carousel.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/ccurve.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/celtic.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/circuit.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cloudlife.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/compass.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/coral.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/crackberg.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/critical.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/crystal.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cube21.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cubenetic.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cubestorm.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/cynosure.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/dangerball.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/decayscreen.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/deco.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/deluxe.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/demon.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/discrete.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/distort.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/drift.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/endgame.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/engine.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/epicycle.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/eruption.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/euler2d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/extrusion.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fadeplot.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fiberlamp.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fireworkx.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flag.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flame.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flipflop.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flipscreen3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fliptext.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flow.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fluidballs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flurry.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/flyingtoasters.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fontglide.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/forest.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/fuzzyflakes.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/galaxy.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/gears.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/gflux.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glblur.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/gleidescope.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glforestfire.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glhanoi.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glknots.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glmatrix.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glplanet.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glslideshow.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/glsnake.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/gltext.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/goop.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/grav.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/greynetic.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/halftone.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/halo.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/helix.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/hopalong.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/hyperball.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/hypercube.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/hypertorus.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/ifs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/imsmap.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/interaggregate.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/interference.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/intermomentary.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/jigglypuff.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/jigsaw.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/juggle.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/juggler3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/julia.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/kaleidescope.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/klein.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/kumppa.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lament.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/laser.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lavalite.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lightning.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lisa.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lissie.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/lmorph.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/loop.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/maze.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/memscroller.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/menger.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/metaballs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/mirrorblob.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/mismunch.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/moebius.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/moire.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/moire2.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/molecule.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/morph3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/mountain.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/munch.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/nerverot.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/noof.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/noseguy.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pacman.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pedal.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/penetrate.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/penrose.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/petri.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/phosphor.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/piecewise.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pinion.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pipes.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/polyhedra.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/polyominoes.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/polytopes.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pong.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/popsquares.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/providence.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pulsar.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/pyro.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/qix.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/queens.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rd-bomb.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/ripples.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rocks.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rorschach.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rotor.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rotzoomer.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/rubik.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sballs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/shadebobs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sierpinski.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sierpinski3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/slidescreen.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/slip.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sonar.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/speedmine.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sphere.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/spheremonics.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/spiral.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/spotlight.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/sproingies.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/squiral.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/stairs.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/starfish.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/starwars.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/stonerview.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/strange.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/substrate.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/superquadrics.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/swirl.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/t3d.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/tangram.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/thornbird.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/timetunnel.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/triangle.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/truchet.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/twang.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/vermiculate.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/vidwhacker.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/vines.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/wander.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/webcollage.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/whirlwindwarp.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/whirlygig.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/worm.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/wormhole.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xanalogtv.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xflame.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xjack.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xlyap.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xmatrix.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xrayswarm.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xspirograph.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/xteevee.desktop
-share/gnome/gnome-screensaver/themes/xscreensaver/zoom.desktop
 share/gnome/pixmaps/backgrounds/cosmos/cloud.jpg
 share/gnome/pixmaps/backgrounds/cosmos/comet.jpg
 share/gnome/pixmaps/backgrounds/cosmos/earth-horizon.jpg
@@ -275,6 +73,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
 @dirrm share/gnome/pixmaps/backgrounds/cosmos
 @dirrm share/gnome/pixmaps/backgrounds
 @dirrm libexec/gnome-screensaver
-@dirrm share/gnome/gnome-screensaver/themes/xscreensaver
-@dirrm share/gnome/gnome-screensaver/themes
-@dirrm share/gnome/gnome-screensaver