From e60dea4ccc05c871d7415e25cc9d900c21bf44a5 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Mon, 29 Nov 2010 18:04:35 +0000
Subject: update to 5.12 changes: -New molecule in molecule -glhanoi now
 supports an arbitrary number of poles -Turned on ``New Login'' button by
 default -Added support for XInput-style alternate input devices -OSX-specific
 fixes

---
 x11/xscreensaver/Makefile.common  |  4 ++--
 x11/xscreensaver/distinfo         | 10 +++++-----
 x11/xscreensaver/patches/patch-ad | 21 +++++++++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'x11')

diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index cc012d98d89..e2d6b089b43 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.102 2010/05/17 16:35:03 drochner Exp $
+# $NetBSD: Makefile.common,v 1.103 2010/11/29 18:04:35 drochner Exp $
 #
 
 # When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=		xscreensaver-5.11
+DISTNAME=		xscreensaver-5.12
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 6efed7a1a6d..4d379639202 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.57 2010/05/17 16:35:03 drochner Exp $
+$NetBSD: distinfo,v 1.58 2010/11/29 18:04:35 drochner Exp $
 
-SHA1 (xscreensaver-5.11.tar.gz) = 8cc46c4e80124fba0890fa9e37e3b4ff87c6a8cf
-RMD160 (xscreensaver-5.11.tar.gz) = ca9e1ceb570e6e1a9797cbd988232fc80780297b
-Size (xscreensaver-5.11.tar.gz) = 5585001 bytes
+SHA1 (xscreensaver-5.12.tar.gz) = 7252540b1b1853459a56453714c0974de26fa4c5
+RMD160 (xscreensaver-5.12.tar.gz) = c0fbd8cfad2919b06c8479bcebfa9af81aa97ae6
+Size (xscreensaver-5.12.tar.gz) = 5606851 bytes
 SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
 SHA1 (patch-ab) = a4abfe0b769d528fda56968801c49e622d2c3424
 SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388
-SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
+SHA1 (patch-ad) = 45f739d70e2b4d96f491aa35ded3c9edfb745e18
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
 SHA1 (patch-ai) = ceda5f16e4fca352a3c4cd6cbdc55d43d3e7b6d5
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index 338fd32c8e7..5cecffef408 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.21 2008/03/10 12:37:12 drochner Exp $
+$NetBSD: patch-ad,v 1.22 2010/11/29 18:04:35 drochner Exp $
 
---- driver/Makefile.in.orig	2008-03-02 06:34:46.000000000 +0100
+--- driver/Makefile.in.orig	2010-09-15 10:10:53.000000000 +0000
 +++ driver/Makefile.in
-@@ -227,7 +227,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
+@@ -207,7 +207,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
+ SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
+ 		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
+ 		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+-		  $(PASSWD_LIBS)
++		  $(PASSWD_LIBS) $(INTL_LIBS)
+ 
+ CMD_LIBS	= $(LIBS) $(X_LIBS) \
+ 		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
+@@ -229,7 +229,7 @@ HDRS		= XScreenSaver_ad.h XScreenSaver_X
  		  xscreensaver.h prefs.h remote.h exec.h \
  		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
  		  demo-Gtk-conf.h auth.h mlstring.h types.h
@@ -11,7 +20,7 @@ $NetBSD: patch-ad,v 1.21 2008/03/10 12:37:12 drochner Exp $
  		  xscreensaver-command.man \
  		  xscreensaver-text.man \
  		  xscreensaver-getimage.man \
-@@ -258,7 +258,7 @@ all: $(EXES) $(EXES2)
+@@ -260,7 +260,7 @@ all: $(EXES) $(EXES2)
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -20,7 +29,7 @@ $NetBSD: patch-ad,v 1.21 2008/03/10 12:37:12 drochner Exp $
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-man uninstall-xml  
  
-@@ -293,7 +293,7 @@ install-program: $(EXES)
+@@ -295,7 +295,7 @@ install-program: $(EXES)
  	fi ;								      \
  	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
  	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@@ -29,7 +38,7 @@ $NetBSD: patch-ad,v 1.21 2008/03/10 12:37:12 drochner Exp $
  		    xscreensaver-getimage @EXES_OSX@ ; do	           \
  	  echo $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
  	       $(INSTALL_PROGRAM) $$exe $(install_prefix)$(bindir)/$$exe ; \
-@@ -492,7 +492,7 @@ install-pam:
+@@ -494,7 +494,7 @@ install-pam:
  
  # screensaver-properties.desktop
  # into /usr/share/applications/
-- 
cgit v1.2.3