[Lunar-commits] r19844 - in moonbase/trunk/x11-apps: xscreensaver xscreensaver-gtk1 xscreensaver-gtk1/pam.d xscreensaver-kde xscreensaver-kde/pam.d

[Florin Braescu]

Author: florin
Date: 2006-04-24 18:18:18 +0000 (Mon, 24 Apr 2006)
New Revision: 19844

Modified:
   moonbase/trunk/x11-apps/xscreensaver-gtk1/BUILD
   moonbase/trunk/x11-apps/xscreensaver-gtk1/pam.d/xscreensaver
   moonbase/trunk/x11-apps/xscreensaver-kde/BUILD
   moonbase/trunk/x11-apps/xscreensaver-kde/pam.d/xscreensaver
   moonbase/trunk/x11-apps/xscreensaver/BUILD
Log:
tweak them a bit.

Modified: moonbase/trunk/x11-apps/xscreensaver/BUILD
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver/BUILD	2006-04-24 17:38:32 UTC (rev 19843)
+++ moonbase/trunk/x11-apps/xscreensaver/BUILD	2006-04-24 18:18:18 UTC (rev 19844)
@@ -11,11 +11,8 @@
   # Enable locking abilities of xscreensaver
   OPTS="$OPTS --enable-locking"
 
-  default_build
+  default_build  &&
 
-  # KDE seems to enjoy having this symlink
-  #if module_installed "kde3" ; then
-  #  ln -s /usr/share/control-center-2.0/screensavers /usr/lib/xscreensaver/config
-  #fi
+  rm -fR /xscreensaver
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11-apps/xscreensaver-gtk1/BUILD
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-gtk1/BUILD	2006-04-24 17:38:32 UTC (rev 19843)
+++ moonbase/trunk/x11-apps/xscreensaver-gtk1/BUILD	2006-04-24 18:18:18 UTC (rev 19844)
@@ -1,16 +1,18 @@
 (
 
+  # Now lets do the PAM stuff the proper way
+  if module_installed Linux-PAM; then
+    OPTS="$OPTS --with-pam --without-shadow"
+  fi
+
   # Enable gtk support
   OPTS="$OPTS --without-motif --with-gtk --with-xml"
 
   # Enable locking abilities of xscreensaver
   OPTS="$OPTS --enable-locking"
   
-  default_build &&
+  default_build  &&
 
-  # KDE seems to enjoy having this symlink
-  if module_installed "kde3" ; then
-    ln -s /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
-  fi 
+  rm -fR /xscreensaver
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11-apps/xscreensaver-gtk1/pam.d/xscreensaver
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-gtk1/pam.d/xscreensaver	2006-04-24 17:38:32 UTC (rev 19843)
+++ moonbase/trunk/x11-apps/xscreensaver-gtk1/pam.d/xscreensaver	2006-04-24 18:18:18 UTC (rev 19844)
@@ -1,4 +1,2 @@
-#
-# The PAM configuration file for the `xscreensaver' service
-#
-auth		required	pam_unix.so
+#%PAM-1.0
+auth		include		system-auth

Modified: moonbase/trunk/x11-apps/xscreensaver-kde/BUILD
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-kde/BUILD	2006-04-24 17:38:32 UTC (rev 19843)
+++ moonbase/trunk/x11-apps/xscreensaver-kde/BUILD	2006-04-24 18:18:18 UTC (rev 19844)
@@ -1,12 +1,17 @@
 (
 
+  # Now lets do the PAM stuff the proper way
+  if module_installed Linux-PAM; then
+    OPTS="$OPTS --with-pam --without-shadow"
+  fi
+
   # Disable gtk support
   OPTS="$OPTS --without-motif --without-gtk --without-pixbuf --with-xml"
 
   # Enable locking abilities of xscreensaver
   OPTS="$OPTS --enable-locking"
   
-  default_build &&
+  default_build  &&
 
   rm -fR /xscreensaver
 

Modified: moonbase/trunk/x11-apps/xscreensaver-kde/pam.d/xscreensaver
===================================================================
--- moonbase/trunk/x11-apps/xscreensaver-kde/pam.d/xscreensaver	2006-04-24 17:38:32 UTC (rev 19843)
+++ moonbase/trunk/x11-apps/xscreensaver-kde/pam.d/xscreensaver	2006-04-24 18:18:18 UTC (rev 19844)
@@ -1,4 +1,2 @@
-#
-# The PAM configuration file for the `xscreensaver' service
-#
-auth		required	pam_unix.so
+#%PAM-1.0
+auth		include		system-auth