From owner-freebsd-ports Wed Feb 13 5:20:36 2002 Delivered-To: freebsd-ports@freebsd.org Received: from nd250009.gab.xdsl.ne.jp (nd250009.gab.xdsl.ne.jp [61.202.250.9]) by hub.freebsd.org (Postfix) with ESMTP id 7AF4637B405; Wed, 13 Feb 2002 05:20:07 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by nd250009.gab.xdsl.ne.jp (8.11.6/8.11.6/NinthNine) with SMTP id g1DDJsa69862; Wed, 13 Feb 2002 22:19:54 +0900 (JST) Message-Id: <200202131319.g1DDJsa69862@nd250009.gab.xdsl.ne.jp> Date: Wed, 13 Feb 2002 22:19:54 +0900 From: Norikatsu Shigemura To: "Jose M. Alcaide" Cc: dougb@FreeBSD.ORG, freebsd-ports@FreeBSD.ORG Subject: Re: ports/34172: xscreensaver 4.00 problem with GNOME In-Reply-To: <20020212154117.G244@v-ger.we.lc.ehu.es> References: <200201232126.g0NLQer49601@freefall.freebsd.org> <200202111848.g1BImE671079@nd250009.gab.xdsl.ne.jp> <20020212154117.G244@v-ger.we.lc.ehu.es> X-Mailer: Sylpheed version 0.7.0 (GTK+ 1.2.10; i386--freebsd4.5) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On Tue, 12 Feb 2002 15:41:17 +0100 "Jose M. Alcaide" wrote: > Did you remember to add bin/screensaver-properties-capplet to the PLIST > (if building with GNOME)? The capplet which comes with GNOME does not work > with xscreensaver-4.00. Sorry, I didn't understand it. Now I understand well. > The problem is that the xscreensaver-supplied capplet overwrites the > GNOME-supplied one. One possible solution may be to make a backup copy of > the original capplet and restore it when the xscreensaver-gnome package is > deleted. Thanks for your nice tsukkomi. Please check following patch. # tsukkomi is good point out in Japanese:-). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -urN x11/xscreensaver/Makefile local/xscreensaver/Makefile --- x11/xscreensaver/Makefile Wed Jan 23 01:23:33 2002 +++ local/xscreensaver/Makefile Wed Feb 13 22:09:55 2002 @@ -22,16 +22,21 @@ WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \ - --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ - --with-configdir=${PREFIX}/share/xscreensaver/config/ + --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ .include .if defined(HAVE_GNOME) -CONFIGURE_ARGS+= --with-gnome +USE_GNOME= yes +CONFIGDIR= ${PREFIX}/share/gnome/control-center/screensavers/ +PLIST_SUB+= CONFIGDIR="share/gnome/control-center/screensavers" WITH_GNOME="" WITHOUT_GNOME="@comment " +CONFIGURE_ARGS+=--with-gnome .else -CONFIGURE_ARGS+= --without-gnome +CONFIGDIR= ${PREFIX}/share/xscreensaver/config/ +PLIST_SUB+= CONFIGDIR="share/xscreensaver/config" WITH_GNOME="@comment " WITHOUT_GNOME="" +CONFIGURE_ARGS+=--without-gnome .endif +CONFIGURE_ARGS+=--with-configdir=${CONFIGDIR} CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml @@ -62,5 +67,12 @@ @ ${SED} -e 's/malloc.h/stdlib.h/g' ${WRKSRC}/hacks/glx/${file}.Dist > \ ${WRKSRC}/hacks/glx/${file} .endfor + +pre-install: + @ if [ ! -f ${PREFIX}/bin/screensaver-properties-capplet.orig ]; then \ + ${MV} ${PREFIX}/bin/screensaver-properties-capplet ${PREFIX}/bin/screensaver-properties-capplet.orig; \ + else \ + ${RM} ${PREFIX}/bin/screensaver-properties-capplet; \ + fi .include diff -urN x11/xscreensaver/pkg-plist local/xscreensaver/pkg-plist --- x11/xscreensaver/pkg-plist Tue Jan 15 03:12:23 2002 +++ local/xscreensaver/pkg-plist Wed Feb 13 22:03:49 2002 @@ -1,3 +1,6 @@ +%%WITH_GNOME%%@exec [ ! -f %D/bin/screensaver-properties-capplet.orig ] && mv -f %D/bin/screensaver-properties-capplet %D/bin/screensaver-properties-capplet.orig || rm %D/bin/screensaver-properties-capplet +%%WITH_GNOME%%bin/screensaver-properties-capplet +%%WITH_GNOME%%@unexec [ -f %D/bin/screensaver-properties-capplet.orig ] && mv -f %D/bin/screensaver-properties-capplet.orig %D/bin/screensaver-properties-capplet bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo @@ -134,147 +137,147 @@ bin/xscreensaver-hacks/xsublim bin/xscreensaver-hacks/xteevee bin/xscreensaver-hacks/zoom -share/xscreensaver/config/README -share/xscreensaver/config/ant.xml -share/xscreensaver/config/atlantis.xml -share/xscreensaver/config/attraction.xml -share/xscreensaver/config/blaster.xml -share/xscreensaver/config/blitspin.xml -share/xscreensaver/config/bouboule.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/ccurve.xml -share/xscreensaver/config/circuit.xml -share/xscreensaver/config/compass.xml -share/xscreensaver/config/coral.xml -share/xscreensaver/config/cosmos.xml -share/xscreensaver/config/critical.xml -share/xscreensaver/config/crystal.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/electricsheep.xml -share/xscreensaver/config/engine.xml -share/xscreensaver/config/epicycle.xml -share/xscreensaver/config/extrusion.xml -share/xscreensaver/config/fadeplot.xml -share/xscreensaver/config/flag.xml -share/xscreensaver/config/flame.xml -share/xscreensaver/config/flipscreen3d.xml -share/xscreensaver/config/flow.xml -share/xscreensaver/config/forest.xml -share/xscreensaver/config/galaxy.xml -share/xscreensaver/config/gears.xml -share/xscreensaver/config/gflux.xml -share/xscreensaver/config/glplanet.xml -share/xscreensaver/config/gltext.xml -share/xscreensaver/config/goban.xml -share/xscreensaver/config/goop.xml -share/xscreensaver/config/grav.xml -share/xscreensaver/config/greynetic.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/ifs.xml -share/xscreensaver/config/imsmap.xml -share/xscreensaver/config/interference.xml -share/xscreensaver/config/jigsaw.xml -share/xscreensaver/config/julia.xml -share/xscreensaver/config/kaleidescope.xml -share/xscreensaver/config/kumppa.xml -share/xscreensaver/config/lament.xml -share/xscreensaver/config/laser.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/menger.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/noseguy.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/pipes.xml -share/xscreensaver/config/pulsar.xml -share/xscreensaver/config/pyro.xml -share/xscreensaver/config/qix.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/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/sphereEversion.xml -share/xscreensaver/config/spiral.xml -share/xscreensaver/config/spotlight.xml -share/xscreensaver/config/sproingies.xml -share/xscreensaver/config/squiral.xml -share/xscreensaver/config/ssystem.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/superquadrics.xml -share/xscreensaver/config/swirl.xml -share/xscreensaver/config/t3d.xml -share/xscreensaver/config/triangle.xml -share/xscreensaver/config/truchet.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/xaos.xml -share/xscreensaver/config/xdaliclock.xml -share/xscreensaver/config/xearth.xml -share/xscreensaver/config/xfishtank.xml -share/xscreensaver/config/xflame.xml -share/xscreensaver/config/xjack.xml -share/xscreensaver/config/xlyap.xml -share/xscreensaver/config/xmatrix.xml -share/xscreensaver/config/xmountains.xml -share/xscreensaver/config/xrayswarm.xml -share/xscreensaver/config/xsnow.xml -share/xscreensaver/config/xspirograph.xml -share/xscreensaver/config/xteevee.xml -share/xscreensaver/config/zoom.xml +%%CONFIGDIR%%/README +%%CONFIGDIR%%/ant.xml +%%CONFIGDIR%%/atlantis.xml +%%CONFIGDIR%%/attraction.xml +%%CONFIGDIR%%/blaster.xml +%%CONFIGDIR%%/blitspin.xml +%%CONFIGDIR%%/bouboule.xml +%%CONFIGDIR%%/braid.xml +%%CONFIGDIR%%/bsod.xml +%%CONFIGDIR%%/bubble3d.xml +%%CONFIGDIR%%/bubbles.xml +%%CONFIGDIR%%/bumps.xml +%%CONFIGDIR%%/cage.xml +%%CONFIGDIR%%/ccurve.xml +%%CONFIGDIR%%/circuit.xml +%%CONFIGDIR%%/compass.xml +%%CONFIGDIR%%/coral.xml +%%CONFIGDIR%%/cosmos.xml +%%CONFIGDIR%%/critical.xml +%%CONFIGDIR%%/crystal.xml +%%CONFIGDIR%%/cynosure.xml +%%CONFIGDIR%%/dangerball.xml +%%CONFIGDIR%%/decayscreen.xml +%%CONFIGDIR%%/deco.xml +%%CONFIGDIR%%/deluxe.xml +%%CONFIGDIR%%/demon.xml +%%CONFIGDIR%%/discrete.xml +%%CONFIGDIR%%/distort.xml +%%CONFIGDIR%%/drift.xml +%%CONFIGDIR%%/electricsheep.xml +%%CONFIGDIR%%/engine.xml +%%CONFIGDIR%%/epicycle.xml +%%CONFIGDIR%%/extrusion.xml +%%CONFIGDIR%%/fadeplot.xml +%%CONFIGDIR%%/flag.xml +%%CONFIGDIR%%/flame.xml +%%CONFIGDIR%%/flipscreen3d.xml +%%CONFIGDIR%%/flow.xml +%%CONFIGDIR%%/forest.xml +%%CONFIGDIR%%/galaxy.xml +%%CONFIGDIR%%/gears.xml +%%CONFIGDIR%%/gflux.xml +%%CONFIGDIR%%/glplanet.xml +%%CONFIGDIR%%/gltext.xml +%%CONFIGDIR%%/goban.xml +%%CONFIGDIR%%/goop.xml +%%CONFIGDIR%%/grav.xml +%%CONFIGDIR%%/greynetic.xml +%%CONFIGDIR%%/halo.xml +%%CONFIGDIR%%/helix.xml +%%CONFIGDIR%%/hopalong.xml +%%CONFIGDIR%%/hyperball.xml +%%CONFIGDIR%%/hypercube.xml +%%CONFIGDIR%%/ifs.xml +%%CONFIGDIR%%/imsmap.xml +%%CONFIGDIR%%/interference.xml +%%CONFIGDIR%%/jigsaw.xml +%%CONFIGDIR%%/julia.xml +%%CONFIGDIR%%/kaleidescope.xml +%%CONFIGDIR%%/kumppa.xml +%%CONFIGDIR%%/lament.xml +%%CONFIGDIR%%/laser.xml +%%CONFIGDIR%%/lightning.xml +%%CONFIGDIR%%/lisa.xml +%%CONFIGDIR%%/lissie.xml +%%CONFIGDIR%%/lmorph.xml +%%CONFIGDIR%%/loop.xml +%%CONFIGDIR%%/maze.xml +%%CONFIGDIR%%/menger.xml +%%CONFIGDIR%%/moebius.xml +%%CONFIGDIR%%/moire.xml +%%CONFIGDIR%%/moire2.xml +%%CONFIGDIR%%/molecule.xml +%%CONFIGDIR%%/morph3d.xml +%%CONFIGDIR%%/mountain.xml +%%CONFIGDIR%%/munch.xml +%%CONFIGDIR%%/nerverot.xml +%%CONFIGDIR%%/noseguy.xml +%%CONFIGDIR%%/pedal.xml +%%CONFIGDIR%%/penetrate.xml +%%CONFIGDIR%%/penrose.xml +%%CONFIGDIR%%/petri.xml +%%CONFIGDIR%%/phosphor.xml +%%CONFIGDIR%%/pipes.xml +%%CONFIGDIR%%/pulsar.xml +%%CONFIGDIR%%/pyro.xml +%%CONFIGDIR%%/qix.xml +%%CONFIGDIR%%/rd-bomb.xml +%%CONFIGDIR%%/ripples.xml +%%CONFIGDIR%%/rocks.xml +%%CONFIGDIR%%/rorschach.xml +%%CONFIGDIR%%/rotor.xml +%%CONFIGDIR%%/rotzoomer.xml +%%CONFIGDIR%%/rubik.xml +%%CONFIGDIR%%/shadebobs.xml +%%CONFIGDIR%%/sierpinski.xml +%%CONFIGDIR%%/sierpinski3d.xml +%%CONFIGDIR%%/slidescreen.xml +%%CONFIGDIR%%/slip.xml +%%CONFIGDIR%%/sonar.xml +%%CONFIGDIR%%/speedmine.xml +%%CONFIGDIR%%/sphere.xml +%%CONFIGDIR%%/sphereEversion.xml +%%CONFIGDIR%%/spiral.xml +%%CONFIGDIR%%/spotlight.xml +%%CONFIGDIR%%/sproingies.xml +%%CONFIGDIR%%/squiral.xml +%%CONFIGDIR%%/ssystem.xml +%%CONFIGDIR%%/stairs.xml +%%CONFIGDIR%%/starfish.xml +%%CONFIGDIR%%/starwars.xml +%%CONFIGDIR%%/stonerview.xml +%%CONFIGDIR%%/strange.xml +%%CONFIGDIR%%/superquadrics.xml +%%CONFIGDIR%%/swirl.xml +%%CONFIGDIR%%/t3d.xml +%%CONFIGDIR%%/triangle.xml +%%CONFIGDIR%%/truchet.xml +%%CONFIGDIR%%/vermiculate.xml +%%CONFIGDIR%%/vidwhacker.xml +%%CONFIGDIR%%/vines.xml +%%CONFIGDIR%%/wander.xml +%%CONFIGDIR%%/webcollage.xml +%%CONFIGDIR%%/whirlwindwarp.xml +%%CONFIGDIR%%/whirlygig.xml +%%CONFIGDIR%%/worm.xml +%%CONFIGDIR%%/xaos.xml +%%CONFIGDIR%%/xdaliclock.xml +%%CONFIGDIR%%/xearth.xml +%%CONFIGDIR%%/xfishtank.xml +%%CONFIGDIR%%/xflame.xml +%%CONFIGDIR%%/xjack.xml +%%CONFIGDIR%%/xlyap.xml +%%CONFIGDIR%%/xmatrix.xml +%%CONFIGDIR%%/xmountains.xml +%%CONFIGDIR%%/xrayswarm.xml +%%CONFIGDIR%%/xsnow.xml +%%CONFIGDIR%%/xspirograph.xml +%%CONFIGDIR%%/xteevee.xml +%%CONFIGDIR%%/zoom.xml lib/X11/app-defaults/XScreenSaver -@dirrm share/xscreensaver/config -@dirrm share/xscreensaver +@dirrm %%CONFIGDIR%% +%%WITHOUT_GNOME%%@dirrm share/xscreensaver @dirrm bin/xscreensaver-hacks - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message