--- a/open-src/app/xscreensaver/Makefile	Mon Nov 20 13:16:25 2006 -0800
+++ b/open-src/app/xscreensaver/Makefile	Wed Nov 22 09:39:32 2006 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.70	06/11/20
+# @(#)Makefile	1.71	06/11/22
 #
 
 PWD:sh=pwd
@@ -70,7 +70,8 @@
 	glsnake.patch \
         allowRootByPassFlag.patch \
 	bug-6478841.patch \
-	bug-6461887.patch
+	bug-6461887.patch \
+	bug1-6461887.patch
 
 # Directory created by unpacking source
 SOURCE_DIR=$(BUILD_DIR)/xscreensaver-$(XSCREENSAVER_VERS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xscreensaver/bug1-6461887.patch	Wed Nov 22 09:39:32 2006 -0800
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
+ */
+
+diff -urp -x '*~' driver/Makefile.in driver~/Makefile.in
+--- driver/Makefile.in	2006-11-22 08:12:33.508250000 -0800
++++ driver~/Makefile.in	2006-11-22 08:42:39.172575000 -0800
+@@ -804,7 +804,7 @@ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
+ #
+ xscreensaver: $(SAVER_OBJS) $(TRUSTED_OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(TRUSTED_OBJS) \
+-	$(TRUSTED_LIBS) $(SAVER_LIBS)
++	$(TRUSTED_LIBS) $(SAVER_LIBS) -lgconf-2
+ 
+ xscreensaver-command: $(CMD_OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS)