[PC-BSD Commits] r17591 - in pcbsd/current/build-files/metapkgsets/pcbsd: . pkgset/base-system

[svn at pcbsd.org]

Author: kris
Date: 2012-07-03 13:13:17 +0000 (Tue, 03 Jul 2012)
New Revision: 17591

Modified:
   pcbsd/current/build-files/metapkgsets/pcbsd/make.conf
   pcbsd/current/build-files/metapkgsets/pcbsd/pkgset/base-system/ports-list
Log:

Switch us to xscreensaver, with PAM and KERBEROS support. Will have
to figure out how to make GNOME work with it instead. 



Modified: pcbsd/current/build-files/metapkgsets/pcbsd/make.conf
===================================================================
--- pcbsd/current/build-files/metapkgsets/pcbsd/make.conf	2012-07-03 12:02:32 UTC (rev 17590)
+++ pcbsd/current/build-files/metapkgsets/pcbsd/make.conf	2012-07-03 13:13:17 UTC (rev 17591)
@@ -151,3 +151,13 @@
 
 # Enable sudo LDAP
 sudo_SET=LDAP
+
+# Use regular xscreensaver port
+.if ${.CURDIR:M${PORTSDIR}/x11/gnome2-lite} != "" 
+  WITH_XSCREENSAVER=yes 
+  WITH_PAM=yes 
+  WITH_KERBEROS=yes 
+.endif 
+
+# OptionsNG 
+gnome2_SET=XSCREENSAVER PAM KERBEROS

Modified: pcbsd/current/build-files/metapkgsets/pcbsd/pkgset/base-system/ports-list
===================================================================
--- pcbsd/current/build-files/metapkgsets/pcbsd/pkgset/base-system/ports-list	2012-07-03 12:02:32 UTC (rev 17590)
+++ pcbsd/current/build-files/metapkgsets/pcbsd/pkgset/base-system/ports-list	2012-07-03 13:13:17 UTC (rev 17591)
@@ -108,7 +108,7 @@
 /usr/ports/x11-fonts/webfonts
 /usr/ports/sysutils/anacron
 /usr/ports/x11/gtk-theme-switch2
-/usr/ports/x11/xscreensaver-gnome
+/usr/ports/x11/xscreensaver
 /usr/ports/print/foo2zjs
 /usr/ports/multimedia/linux_dvbwrapper-kmod
 /usr/ports/x11/xvkbd