[Lunar-commits] CVS: moonbase/x11-apps/xscreensaver CONFIGURE, NONE, 1.1 BUILD, 1.5, 1.6 DEPENDS, 1.4, 1.5 DETAILS, 1.8, 1.9

[Chad Kittel]

Update of /var/cvs/lunar/moonbase/x11-apps/xscreensaver
In directory espresso.lunar-linux.org:/tmp/cvs-serv7512/xscreensaver

Modified Files:
	BUILD DEPENDS DETAILS 
Added Files:
	CONFIGURE 
Log Message:
A rather extensive (and needed) cleanup of the depends for this module.  
I don't know if the technique I used to "group depends" is standard but
seems to work.  Also did some cosmetic cleanups to the details file.


--- NEW FILE: CONFIGURE ---
if ! grep -q USE_GTK $MODULE_CONFIG; then
  if query "Do you want to use gtk instead of motif (recommended to say Y here)? " y
    then
      USE_GTK="y"

      # Find out what version
      if query "Would you like to use gtk+-2 instead of gtk+? " y
        then USE_GTK2="y"
        else USE_GTK2="n"
      fi
    else 
      USE_GTK="n"
  fi
fi

echo "USE_GTK=$USE_GTK"   >  $MODULE_CONFIG
echo "USE_GTK2=$USE_GTK2" >> $MODULE_CONFIG

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	19 Feb 2004 05:24:03 -0000	1.5
+++ BUILD	23 Sep 2004 01:12:10 -0000	1.6
@@ -1,13 +1,27 @@
 (
 
-  ./configure	--build=$BUILD            \
-            	--prefix=/usr             \
-            	--sysconfdir=/etc         \
-            	--infodir=/usr/share/info \
-           	--mandir=/usr/share/man   \
-		--with-gl                 \
-                --with-xml                \
-		$OPTS                     &&
-  default_make
+  # 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
+  
+  ./configure	--build=$BUILD                         \
+            	--prefix=$MODULE_PREFIX                \
+           	--mandir=$MODULE_PREFIX/share/man      \
+                --x-libraries=/usr/X11R6/lib           \
+                --x-includes=/usr/X11R6/include        \
+                --enable-locking                       \ 
+                # All "--with-*" options are on by default, but are 
+                # only enabled if ./configure sees it is possible
+		$OPTS                                  &&
+  
+  default_make &&
+
+  # KDE seems to enjoy having this symlink
+  if module_installed "kde3" ; then
+    ln -s /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
+  fi 
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/DEPENDS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEPENDS	19 Feb 2004 19:23:16 -0000	1.4
+++ DEPENDS	23 Sep 2004 01:12:10 -0000	1.5
@@ -1,5 +1,33 @@
-depends  glut	&&
-depends  bc	&&
+# Note: this style of depends throws off 'lvu tree xscreensaver.'
 
-optional_depends "gtk+-2" "--with-gtk" "--without-gtk"  &&
-optional_depends libglade2 
+# 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
+  
+  depends libxml2  # needed only for the gtk version of xscreensaver-demo
+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 &&   # used for webcollage and vidwhacker
+depends bc     &&
+depends glut   &&
+depends perl   &&
+
+# If we ever get 'gle' in the moonbase add an optional depends, one 
+# screensaver needs it in order to install
+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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	15 Aug 2004 07:34:14 -0000	1.8
+++ DETAILS	23 Sep 2004 01:12:10 -0000	1.9
@@ -4,15 +4,15 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
    SOURCE_URL[0]=http://www.jwz.org/$MODULE/$SOURCE
    SOURCE_URL[1]=http://packetstorm.widexs.nl/UNIX/admin/$SOURCE
-      SOURCE_VFY=md5:24847c37e2eb54e590997878232530ce
+      SOURCE_VFY=sha1:8f7fdf53dbcc3cc96c5d9d4165c66289859d80c5
         WEB_SITE=http://www.jwz.org/xscreensaver
          ENTERED=20010922
          UPDATED=20040815
-        SHORT="A modular screen saver and locker for X."
+           SHORT="A modular screen saver and locker for X."
 
 cat << EOF
 XScreenSaver is a modular screen saver and locker for the X Window
 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 120
+that can draw on the root window as a display mode.  More than 160
 display modes are included in this package.
 EOF