Date: Wed, 13 Feb 2002 16:34:24 +0200 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Jeremy Lea <reg@FreeBSD.org> Cc: Ade Lovett <ade@supernews.net>, gnome@FreeBSD.org, dougb@FreeBSD.org Subject: Re: An interesting issue with bsd.gnome.mk Message-ID: <3C6A7970.BA6ABF07@FreeBSD.org> References: <B88F3021.5F0A%ade@supernews.net> <20020213095703.A51972@shale.csir.co.za>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------CC7FA13CC7600AB27F37B092
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Jeremy Lea wrote:
>
> Hi,
>
> On Tue, Feb 12, 2002 at 08:48:33PM -0600, Ade Lovett wrote:
> > It doesn't.
>
> Try this...
Attached patch should fix xscreensaver+GNOME properly. Doug, please
give your blessing.
There is another problem - namely the fact that gnomecc installs its
own version of the screensaver capplet replacing gomecc's one. My
proposition is to disable gnomecc's version of the capplet, because it
is null and void without xscreensaver port installed anyway.
-Maxim
--------------CC7FA13CC7600AB27F37B092
Content-Type: text/plain; charset=koi8-r;
name="xscreensaver.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="xscreensaver.diff"
? pkg-plist,v
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.45
diff -d -u -r1.45 Makefile
--- Makefile 22 Jan 2002 15:20:38 -0000 1.45
+++ Makefile 13 Feb 2002 14:33:38 -0000
@@ -28,6 +28,7 @@
.include <bsd.port.pre.mk>
.if defined(HAVE_GNOME)
+USE_GNOME= yes
CONFIGURE_ARGS+= --with-gnome
.else
CONFIGURE_ARGS+= --without-gnome
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/xscreensaver/pkg-plist,v
retrieving revision 1.24
diff -d -u -r1.24 pkg-plist
--- pkg-plist 14 Jan 2002 03:04:03 -0000 1.24
+++ pkg-plist 13 Feb 2002 14:33:38 -0000
@@ -1,3 +1,4 @@
+%%GNOME:%%bin/screensaver-properties-capplet
bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-demo
@@ -134,6 +135,15 @@
bin/xscreensaver-hacks/xsublim
bin/xscreensaver-hacks/xteevee
bin/xscreensaver-hacks/zoom
+%%GNOME:%%share/gnome/control-center/Desktop/screensaver-properties.desktop
+%%GNOME:%%share/gnome/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+%%GNOME:%%share/gnome/pixmaps/screensaver-cmndln.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-colorselector.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-diagnostic.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-locking.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm
+%%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm
+%%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm
share/xscreensaver/config/README
share/xscreensaver/config/ant.xml
share/xscreensaver/config/atlantis.xml
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/x11/xscreensaver/files/patch-ab,v
retrieving revision 1.8
diff -d -u -r1.8 patch-ab
--- files/patch-ab 14 Jan 2002 03:04:04 -0000 1.8
+++ files/patch-ab 13 Feb 2002 14:33:38 -0000
@@ -1,5 +1,8 @@
---- configure.orig Wed Jan 2 00:15:22 2002
-+++ configure Sun Jan 13 15:52:38 2002
+
+$FreeBSD$
+
+--- configure.orig Wed Jan 2 10:15:22 2002
++++ configure Wed Feb 13 15:53:35 2002
@@ -5999,7 +5999,7 @@
PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
elif test "$have_kerberos" = yes ; then
@@ -9,11 +12,13 @@
fi
if test "$have_kerberos" = yes ; then
-@@ -9883,6 +9883,8 @@
+@@ -9881,8 +9881,8 @@
+ # Now that we know whether we have Gnome, we can decide where the XML
+ # config files get installed.
if test -z "$HACK_CONF_DIR" ; then
- if test -n "$GNOME_DATADIR" ; then
- HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
-+ elif test -n "$CONFIGDIR" ; then
+- if test -n "$GNOME_DATADIR" ; then
+- HACK_CONF_DIR='${GNOME_DATADIR}/control-center/screensavers'
++ if test -n "$CONFIGDIR" ; then
+ HACK_CONF_DIR="$CONFIGDIR"
else
HACK_CONF_DIR='${prefix}/lib/xscreensaver/config'
--------------CC7FA13CC7600AB27F37B092--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3C6A7970.BA6ABF07>