Date: Wed, 13 Feb 2002 22:09:18 +0200 From: Jeremy Lea <reg@FreeBSD.ORG> To: Ade Lovett <ade@supernews.net> Cc: gnome@FreeBSD.ORG, Doug Barton <dougb@FreeBSD.ORG> Subject: Re: Xscreensaver and GNOME Message-ID: <20020213220918.B55468@shale.csir.co.za> In-Reply-To: <B8901C38.61B7%ade@supernews.net>; from ade@supernews.net on Wed, Feb 13, 2002 at 01:35:52PM -0600 References: <B8901C38.61B7%ade@supernews.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
On Wed, Feb 13, 2002 at 01:35:52PM -0600, Ade Lovett wrote:
> (1) sysutils/gnomecontrolcenter - no longer install screensaver capplet
> (2) x11/xscreensaver - reworking to allow slave port, make PREFIX-safe, etc.
> (3) x11/gnome - now depends on x11/xscreensaver-gnome
The attached patch to your patched ports (which I'm building at the
moment) makes the WANT_GNOME stuff work the way that it should. It also
means that people that just install the xscreensaver port get GNOME
support like magic.
I've not tested the gnomecontrolcenter changes.
Regards,
-Jeremy
--
FreeBSD - Because the best things in life are free...
http://www.freebsd.org/
diff -urN -x CVS -x work /tmp/ports/x11/xscreensaver-gnome/Makefile /usr/ports/x11/xscreensaver-gnome/Makefile
--- /tmp/ports/x11/xscreensaver-gnome/Makefile Wed Feb 13 21:53:55 2002
+++ /usr/ports/x11/xscreensaver-gnome/Makefile Wed Feb 13 21:56:09 2002
@@ -11,7 +11,6 @@
MASTERDIR= ${.CURDIR}/../xscreensaver
-WANT_GNOME= YES
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WITH_GNOME= yes
.include "${MASTERDIR}/Makefile"
diff -urN -x CVS -x work /tmp/ports/x11/xscreensaver/Makefile /usr/ports/x11/xscreensaver/Makefile
--- /tmp/ports/x11/xscreensaver/Makefile Wed Feb 13 21:54:14 2002
+++ /usr/ports/x11/xscreensaver/Makefile Wed Feb 13 22:05:28 2002
@@ -20,6 +20,7 @@
USE_XPM= yes
USE_MESA= yes
USE_GTK= yes
+WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
@@ -27,13 +28,13 @@
.include <bsd.port.pre.mk>
-.if defined(WANT_GNOME)
-USE_GNOME= YES
+.if defined(HAVE_GNOME)
+USE_GNOME= yes
CONFIGURE_ARGS+= --with-gnome
-PLIST_SUB+= CONFIGDIR="share/gnome/control-center/screensavers"
+PLIST_SUB+= CONFIGDIR="share/gnome/control-center/screensavers"
.else
CONFIGURE_ARGS+= --without-gnome
-PLIST_SUB+= GNOME:="@comment " CONFIGDIR="share/xscreensaver/config" NOGNOME:=""
+PLIST_SUB+= CONFIGDIR="share/xscreensaver/config"
.endif
CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
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?20020213220918.B55468>