Find the xscreensaver xml files so that screensaver configuration works

fully. Require newer xscreensaver version to match screensaver hacks
listed in PLIST.  Bump PKGREVISION.

4 files changed, 25 insertions, 11 deletions

diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 1de7f3b9c65..6948457528e 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/29 13:10:17 markd Exp $
 
 DISTNAME=	kdeartwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 
-DEPENDS+=	xscreensaver>=4.16:../../x11/xscreensaver
+DEPENDS+=	xscreensaver>=4.19:../../x11/xscreensaver
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST
index 94005ea40a9..8a54c08cff2 100644
--- a/misc/kdeartwork3/PLIST
+++ b/misc/kdeartwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/03/23 22:15:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/06/29 13:10:17 markd Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kclock.kss
@@ -103,6 +103,7 @@ share/kde/applnk/System/ScreenSavers/eruption.desktop
 share/kde/applnk/System/ScreenSavers/euler2d.desktop
 share/kde/applnk/System/ScreenSavers/extrusion.desktop
 share/kde/applnk/System/ScreenSavers/fadeplot.desktop
+share/kde/applnk/System/ScreenSavers/fireworkx.desktop
 share/kde/applnk/System/ScreenSavers/flag.desktop
 share/kde/applnk/System/ScreenSavers/flame.desktop
 share/kde/applnk/System/ScreenSavers/flipflop.desktop
@@ -139,6 +140,7 @@ share/kde/applnk/System/ScreenSavers/hypertorus.desktop
 share/kde/applnk/System/ScreenSavers/ifs.desktop
 share/kde/applnk/System/ScreenSavers/imsmap.desktop
 share/kde/applnk/System/ScreenSavers/interference.desktop
+share/kde/applnk/System/ScreenSavers/intermomentary.desktop
 share/kde/applnk/System/ScreenSavers/jigglypuff.desktop
 share/kde/applnk/System/ScreenSavers/jigsaw.desktop
 share/kde/applnk/System/ScreenSavers/juggle.desktop
@@ -178,6 +180,7 @@ share/kde/applnk/System/ScreenSavers/penrose.desktop
 share/kde/applnk/System/ScreenSavers/petri.desktop
 share/kde/applnk/System/ScreenSavers/phosphor.desktop
 share/kde/applnk/System/ScreenSavers/piecewise.desktop
+share/kde/applnk/System/ScreenSavers/pinion.desktop
 share/kde/applnk/System/ScreenSavers/pipes.desktop
 share/kde/applnk/System/ScreenSavers/polyhedra.desktop
 share/kde/applnk/System/ScreenSavers/polyominoes.desktop
@@ -215,6 +218,7 @@ share/kde/applnk/System/ScreenSavers/starfish.desktop
 share/kde/applnk/System/ScreenSavers/starwars.desktop
 share/kde/applnk/System/ScreenSavers/stonerview.desktop
 share/kde/applnk/System/ScreenSavers/strange.desktop
+share/kde/applnk/System/ScreenSavers/substrate.desktop
 share/kde/applnk/System/ScreenSavers/superquadrics.desktop
 share/kde/applnk/System/ScreenSavers/swirl.desktop
 share/kde/applnk/System/ScreenSavers/t3d.desktop
diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo
index 516bcb2057c..5e2ae164e1b 100644
--- a/misc/kdeartwork3/distinfo
+++ b/misc/kdeartwork3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/05/31 14:52:43 markd Exp $
+$NetBSD: distinfo,v 1.22 2005/06/29 13:10:17 markd Exp $
 
 SHA1 (kdeartwork-3.4.1.tar.bz2) = 397050cd93f2297c65199cf2c86f69925a27a6be
 RMD160 (kdeartwork-3.4.1.tar.bz2) = 5bc92f78ea7967d4ffc6bb23802bc41d0881a974
 Size (kdeartwork-3.4.1.tar.bz2) = 18066167 bytes
-SHA1 (patch-aa) = beb7ff98f208d3e5db0ee252e378c5c44ba6b1a0
+SHA1 (patch-aa) = 6733ecd8a03d124389e79da5df79e9df32569500
 SHA1 (patch-ab) = 907c5cd430b9170e41a2023231cbdaebb05da397
 SHA1 (patch-ac) = bd213b3b9cc2409e6c9a79206a60f37e3d8ed12c
diff --git a/misc/kdeartwork3/patches/patch-aa b/misc/kdeartwork3/patches/patch-aa
index 6d4aefe24da..11db39f5d7e 100644
--- a/misc/kdeartwork3/patches/patch-aa
+++ b/misc/kdeartwork3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/08/21 13:01:33 markd Exp $
+$NetBSD: patch-aa,v 1.4 2005/06/29 13:10:17 markd Exp $
 
---- configure.orig	2004-08-14 11:45:15.000000000 +1200
+--- configure.orig	2005-05-24 03:46:46.000000000 +1200
 +++ configure
-@@ -32300,12 +32300,12 @@ done
+@@ -33095,12 +33095,12 @@ done
  IFS=$old_IFS
  
  
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/21 13:01:33 markd Exp $
  
          if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -32324,16 +32324,16 @@ else
+@@ -33119,16 +33119,16 @@ else
  	IFS=$kde_save_IFS
  
          for dir in $dirs; do
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/21 13:01:33 markd Exp $
                  break
  	    fi
            fi
-@@ -32354,12 +32354,12 @@ fi
+@@ -33149,12 +33149,12 @@ fi
  echo "${ECHO_T}not found" >&6
  
  
@@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/21 13:01:33 markd Exp $
  
          if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -32378,16 +32378,16 @@ else
+@@ -33173,16 +33173,16 @@ else
  	IFS=$kde_save_IFS
  
          for dir in $dirs; do
@@ -76,3 +76,12 @@ $NetBSD: patch-aa,v 1.3 2004/08/21 13:01:33 markd Exp $
                  break
  	    fi
            fi
+@@ -33356,7 +33356,7 @@ _ACEOF
+ 
+      echo "$as_me:$LINENO: checking for flame.xml" >&5
+ echo $ECHO_N "checking for flame.xml... $ECHO_C" >&6
+-     for subdir in lib/xscreensaver/config \
++     for subdir in libexec/xscreensaver/config \
+ 		   lib/X11/xscreensaver/config \
+ 		   share/control-center/screensavers \
+ 		   share/control-center/screensavers \