Update xscreensaver to 3.16.

4 files changed, 26 insertions, 9 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index aba065232c6..f199b9e9499 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 1999/06/12 16:49:52 frueauf Exp $
+# $NetBSD: Makefile,v 1.27 1999/07/02 15:23:12 frueauf Exp $
 #
 
-DISTNAME=	xscreensaver-3.14
+DISTNAME=	xscreensaver-3.16
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -20,5 +20,6 @@ CONFIGURE_ENV+=	INSTALL=/usr/bin/install
 
 USE_X11BASE=	yes
 USE_MOTIF=	yes
+USE_PERL5=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/files/md5 b/x11/xscreensaver/files/md5
index 3ea0f85f912..388e5d97cd5 100644
--- a/x11/xscreensaver/files/md5
+++ b/x11/xscreensaver/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.20 1999/06/12 16:49:52 frueauf Exp $
+$NetBSD: md5,v 1.21 1999/07/02 15:23:13 frueauf Exp $
 
-MD5 (xscreensaver-3.14.tar.gz) = 894cc1ebf64d040d13a76501a2eb0217
+MD5 (xscreensaver-3.16.tar.gz) = 171fc31ab02efc9c84684ad6a84f595b
diff --git a/x11/xscreensaver/patches/patch-ab b/x11/xscreensaver/patches/patch-ab
index 26543110391..96f975f6418 100644
--- a/x11/xscreensaver/patches/patch-ab
+++ b/x11/xscreensaver/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1999/01/05 11:34:39 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 1999/07/02 15:23:13 frueauf Exp $
 
---- hacks/Makefile.in-orig	Sun Nov 22 09:00:56 1998
-+++ hacks/Makefile.in	Tue Jan  5 02:17:55 1999
-@@ -41,7 +41,7 @@
+--- hacks/Makefile.in.orig	Thu Jun 24 01:00:24 1999
++++ hacks/Makefile.in	Wed Jun 30 18:33:52 1999
+@@ -42,7 +42,7 @@
  # Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc.
  #
  HACK_PRE	= $(LIBS) $(X_LIBS)
@@ -11,3 +11,14 @@ $NetBSD: patch-ab,v 1.1 1999/01/05 11:34:39 frueauf Exp $
  HACK_LIBS	= $(HACK_PRE)            @HACK_LIBS@ $(HACK_POST)
  XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST)
  XLOCK_LIBS	= $(HACK_LIBS)
+@@ -181,8 +181,8 @@
+ 	  else								\
+ 	    p=$(srcdir)/$$program ;					\
+ 	  fi ;								\
+-	  echo $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;		\
+-	  $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;			\
++	  echo $(INSTALL) -c -o root -g wheel -m 555 $$p $(HACKDIR)/$$program ;		\
++	  $(INSTALL) -c -o root -g wheel -m 555 $$p $(HACKDIR)/$$program ;			\
+ 	done
+ 
+ munge-scripts: $(SCRIPTS)
diff --git a/x11/xscreensaver/pkg/PLIST b/x11/xscreensaver/pkg/PLIST
index 3de6821dc2f..246235c4a2a 100644
--- a/x11/xscreensaver/pkg/PLIST
+++ b/x11/xscreensaver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 1999/06/12 16:49:52 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.15 1999/07/02 15:23:13 frueauf Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-demo
@@ -76,6 +76,7 @@ libexec/xscreensaver/rocks
 libexec/xscreensaver/rorschach
 libexec/xscreensaver/rotor
 libexec/xscreensaver/rubik
+libexec/xscreensaver/shadebobs
 libexec/xscreensaver/sierpinski
 libexec/xscreensaver/slidescreen
 libexec/xscreensaver/slip
@@ -93,8 +94,10 @@ libexec/xscreensaver/swirl
 libexec/xscreensaver/t3d
 libexec/xscreensaver/triangle
 libexec/xscreensaver/truchet
+libexec/xscreensaver/vidwhacker
 libexec/xscreensaver/vines
 libexec/xscreensaver/wander
+libexec/xscreensaver/webcollage
 libexec/xscreensaver/worm
 libexec/xscreensaver/xflame
 libexec/xscreensaver/xjack
@@ -157,7 +160,9 @@ man/man1/starfish.1
 man/man1/strange.1
 man/man1/swirl.1
 man/man1/t3d.1
+man/man1/vidwhacker.1
 man/man1/vines.1
+man/man1/webcollage.1
 man/man1/xjack.1
 man/man1/xlyap.1
 man/man1/xroger.1