[Lunar-commits] CVS: moonbase/x11-apps/xscreensaver BUILD, 1.7, 1.8 DEPENDS, 1.7, 1.8 DETAILS, 1.10, 1.11 CONFIGURE, 1.1, NONE

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/x11-apps/xscreensaver
In directory espresso.foo-projects.org:/tmp/cvs-serv29568/xscreensaver

Modified Files:
	BUILD DEPENDS DETAILS 
Removed Files:
	CONFIGURE 
Log Message:
This should be the last of it.  Until alias groups are implemented we can
deal with 3 seperate xscreensaver modules.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD	18 Oct 2004 04:56:49 -0000	1.7
+++ BUILD	25 Oct 2004 23:24:13 -0000	1.8
@@ -1,11 +1,7 @@
 (
 
-  # Enable/Disable certain opts based on the use of gtk
-  if [ "$USE_GTK" = "y" ] ; then
-    OPTS="$OPTS --without-motif --with-gtk --with-xml"
-  else
-    OPTS="$OPTS --with-motif --without-gtk --without-gdk-pixbuff"
-  fi
+  # Enable gtk support
+  OPTS="$OPTS --without-motif --with-gtk --with-xml"
 
   # Enable locking abilities of xscreensaver
   OPTS="$OPTS --enable-locking"

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/DEPENDS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DEPENDS	18 Oct 2004 04:56:49 -0000	1.7
+++ DEPENDS	25 Oct 2004 23:24:13 -0000	1.8
@@ -1,33 +1,12 @@
-# Note: this style of depends throws off 'lvu tree xscreensaver.'
-
-# Did the user tell us we should be using gtk?
-if [ "$USE_GTK" = "y" ] ; then
-  #Yes they did, what version?
-  if [ "$USE_GTK2" = "y" ] ; then
-    # depends needed to enable gtk+-2 support
-    depends gtk+-2    &&
-    depends libglade2 &&
-    optional_depends "yelp" "" "" "help browser support in Gnome"
-  else
-    # depends needed to enable gtk+ support
-    depends gtk+     &&
-    depends libglade &&
-    optional_depends "control-center" "" "" "Gnome control-center support for xscreensaver"
-  fi
-
-  # needed only for the gtk version of xscreensaver-demo  
-  depends libxml2
-else
-  # Nope, gtk was not asked for, that's too bad, will instead use 
-  # deprecated (but still usable) openMotif version
-  depends openMotif  
-fi
-
-depends netpbm &&
-depends bc     &&
-depends glut   &&
-depends perl   &&
+depends gtk+-2    &&
+depends libglade2 &&
+depends libxml2   &&
+depends netpbm    &&
+depends bc        &&
+depends glut      &&
+depends perl      &&
 
-optional_depends "gle" "" "" "to enable any screensavers that use this library" &&
+optional_depends "yelp" "" "" "help browser support in Gnome"
+optional_depends "gle" "--with-gle" "--without-gle" "to enable any screensavers that use this library" &&
 optional_depends "gettext" "--enable-nls" "--disable-nls" "Enable NLS support"  &&
 optional_depends "fortune" "--with-fortune=/usr/games/fortune" "" "for screensavers that use fortune"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/DETAILS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DETAILS	5 Oct 2004 09:30:22 -0000	1.10
+++ DETAILS	25 Oct 2004 23:24:13 -0000	1.11
@@ -14,4 +14,6 @@
 System. It is highly customizable and allows the use of any program
 that can draw on the root window as a display mode.  More than 160
 display modes are included in this package.
+
+Note: This module builds the gtk+-2 screensaver-demo application!
 EOF

--- CONFIGURE DELETED ---