update to 5.11

changes:
-New versions of photopile, strange
-bugfixes

4 files changed, 20 insertions, 21 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 4244c3f903f..124a5ae11af 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.89 2010/05/08 16:53:06 tez Exp $
+# $NetBSD: Makefile,v 1.90 2010/05/17 16:35:03 drochner Exp $
 
-PKGREVISION=	1
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome<4.14
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 19f8150e65b..cc012d98d89 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.101 2010/05/08 16:53:06 tez Exp $
+# $NetBSD: Makefile.common,v 1.102 2010/05/17 16:35:03 drochner Exp $
 #
 
 # When updating the package,
 # please check kdeartwork3 -- it installs some extra
 # files depending on which screensavers it finds.
-DISTNAME=		xscreensaver-5.10
+DISTNAME=		xscreensaver-5.11
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE}
 
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
 
 CONFIGURE_ARGS+=	--without-motif
 
-CONFIGURE_ENV+=		X_PRE_LIBS=-lXt
 CONFIGURE_ENV+=		ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
 CONFIGURE_ENV+=		ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
 CONFIGURE_ENV+=		INTLTOOL_PERL=${PERL5:Q}
@@ -66,3 +65,4 @@ INSTALL_MAKE_FLAGS=	install_prefix=${DESTDIR}
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index dd691b15fb9..6efed7a1a6d 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.56 2010/05/08 16:53:06 tez Exp $
+$NetBSD: distinfo,v 1.57 2010/05/17 16:35:03 drochner Exp $
 
-SHA1 (xscreensaver-5.10.tar.gz) = d8379928de2e6e86cc7b17d75150daafe57e93c4
-RMD160 (xscreensaver-5.10.tar.gz) = 6c437ef89969a0bf886f27b2430b53a431146b20
-Size (xscreensaver-5.10.tar.gz) = 5561162 bytes
+SHA1 (xscreensaver-5.11.tar.gz) = 8cc46c4e80124fba0890fa9e37e3b4ff87c6a8cf
+RMD160 (xscreensaver-5.11.tar.gz) = ca9e1ceb570e6e1a9797cbd988232fc80780297b
+Size (xscreensaver-5.11.tar.gz) = 5585001 bytes
 SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979
 SHA1 (patch-ab) = a4abfe0b769d528fda56968801c49e622d2c3424
-SHA1 (patch-ac) = d575520bbe7d2ba2363a19620576b12d7110c19d
+SHA1 (patch-ac) = 3bd2652cb0eabaffe4494e9aca8fe2df9f9e0388
 SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3
diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac
index 5875ece387e..f73605a120b 100644
--- a/x11/xscreensaver/patches/patch-ac
+++ b/x11/xscreensaver/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
+$NetBSD: patch-ac,v 1.23 2010/05/17 16:35:03 drochner Exp $
 
---- configure.orig	2009-09-08 04:54:40.000000000 +0000
+--- configure.orig	2010-04-13 20:37:06.000000000 +0000
 +++ configure
-@@ -3505,6 +3505,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp
+@@ -3651,6 +3651,9 @@ $as_echo "$ac_cv_gcc_accepts_no_cpp_prec
     ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp"
    fi
  
@@ -12,15 +12,15 @@ $NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
  if test -n "$GCC"; then
  
    case "$host" in
-@@ -3565,6 +3568,7 @@ echo "${ECHO_T}Disabling C++ comments in
-      CC="$CC -Wp,-lang-c89"
+@@ -3711,6 +3714,7 @@ $as_echo "Disabling C++ comments in ANSI
+ #     CC="$CC -Wp,-lang-c89"
     fi
    fi
 +fi
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7936,7 +7940,7 @@ _ACEOF
+@@ -8329,7 +8333,7 @@ _ACEOF
  
  
  
@@ -29,8 +29,8 @@ $NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-@@ -13632,7 +13636,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14227,7 +14231,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lkrb4  $LIBS"
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13719,7 +13723,7 @@ echo "$as_me: WARNING: Cannot find compa
+@@ -14318,7 +14322,7 @@ $as_echo "$as_me: WARNING: Cannot find c
      # from Matt Knopp <mhat@infocalypse.netlag.com>
      # (who got it from amu@mit.edu)
  
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
  
      # jwz: MacOS X uses -lkrb5, but not -lcrypt
  
-@@ -14881,7 +14885,7 @@ fi
+@@ -15524,7 +15528,7 @@ fi
  #
  if test "$enable_locking" = yes ; then
    case "$host" in
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $
        need_setuid=yes
      ;;
    esac
-@@ -15315,11 +15319,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" >
+@@ -15958,11 +15962,7 @@ $as_echo "$ac_cv_gtk_config_libs" >&6; }
    ac_gtk_config_libs=$ac_cv_gtk_config_libs
  
    GTK_EXTRA_OBJS=""