[Lunar-commits] CVS: moonbase/x11-apps/xscreensaver BUILD, 1.6, 1.7 DEPENDS, 1.6, 1.7

[Chad Kittel]

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

Modified Files:
	BUILD DEPENDS 
Log Message:
Sorry about the back to back commits.  I was having a few uunexpected
issues on this side.  Took the opertunity to simplify things in the BUILD
file.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	23 Sep 2004 01:12:10 -0000	1.6
+++ BUILD	18 Oct 2004 04:56:49 -0000	1.7
@@ -6,18 +6,11 @@
   else
     OPTS="$OPTS --with-motif --without-gtk --without-gdk-pixbuff"
   fi
+
+  # Enable locking abilities of xscreensaver
+  OPTS="$OPTS --enable-locking"
   
-  ./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 &&
+  default_build &&
 
   # KDE seems to enjoy having this symlink
   if module_installed "kde3" ; then

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xscreensaver/DEPENDS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DEPENDS	18 Oct 2004 04:25:30 -0000	1.6
+++ DEPENDS	18 Oct 2004 04:56:49 -0000	1.7
@@ -14,15 +14,16 @@
     depends libglade &&
     optional_depends "control-center" "" "" "Gnome control-center support for xscreensaver"
   fi
-  
-  depends libxml2  # needed only for the gtk version of xscreensaver-demo
+
+  # 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 &&   # used for webcollage and vidwhacker
+depends netpbm &&
 depends bc     &&
 depends glut   &&
 depends perl   &&