Install xscreensaver-demo man page with xscreensaver-demo package, not

with xscreeensaver package. Bump PKGREVISION for both.

Patch from Kouichirou Hiratsuka.

4 files changed, 16 insertions, 8 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 2455e378ae0..a762b024835 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/04/11 21:48:16 tv Exp $
+# $NetBSD: Makefile,v 1.71 2005/04/21 15:01:43 wiz Exp $
 
 COMMENT=	Screen saver and locker for the X window system
 
@@ -6,8 +6,8 @@ CONFLICTS+=	xscreensaver-gnome<4.14
 # man/man1/barcode.1
 CONFLICTS+=	barcode-[0-9]*
 
-
 .include "Makefile.common"
+PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST
index a3c49549cb2..5eef39a9b74 100644
--- a/x11/xscreensaver/PLIST
+++ b/x11/xscreensaver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/03/24 13:55:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/04/21 15:01:43 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -590,7 +590,6 @@ man/man1/xlyap.1
 man/man1/xmatrix.1
 man/man1/xrayswarm.1
 man/man1/xscreensaver-command.1
-man/man1/xscreensaver-demo.1
 man/man1/xscreensaver-getimage-file.1
 man/man1/xscreensaver-getimage-video.1
 man/man1/xscreensaver-getimage.1
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index d014dc3949a..5bb123d9036 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2005/04/04 09:14:45 wiz Exp $
+$NetBSD: distinfo,v 1.42 2005/04/21 15:01:43 wiz Exp $
 
 SHA1 (xscreensaver-4.21.tar.gz) = 2f6aa051a2f9e9f041133c0a60746e830228f09b
 RMD160 (xscreensaver-4.21.tar.gz) = ae31d5e57ce9e2eece3dfba424af9ebab2c12993
@@ -6,7 +6,7 @@ Size (xscreensaver-4.21.tar.gz) = 4519828 bytes
 SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326
 SHA1 (patch-ab) = b67eccd08776b212935959447a27662da1e54ae3
 SHA1 (patch-ac) = e4711dc13810555071150268eb26b848f8eb1987
-SHA1 (patch-ad) = 30fd2f7a73ec902134cdfa7b7c1f320c41ac2a2b
+SHA1 (patch-ad) = 3c8a393d1198ef47c664ab831744f1d0ab03e0cf
 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225
 SHA1 (patch-af) = 2340efe0cf677a20c336570b24374d675f5cd6eb
 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114
diff --git a/x11/xscreensaver/patches/patch-ad b/x11/xscreensaver/patches/patch-ad
index a52ba5690f5..b579fa8966e 100644
--- a/x11/xscreensaver/patches/patch-ad
+++ b/x11/xscreensaver/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.15 2005/04/04 09:14:45 wiz Exp $
+$NetBSD: patch-ad,v 1.16 2005/04/21 15:01:43 wiz Exp $
 
 --- driver/Makefile.in.orig	2005-03-21 16:18:18.000000000 +0900
-+++ driver/Makefile.in	2005-04-03 20:09:35.000000000 +0900
++++ driver/Makefile.in	2005-04-20 17:28:14.000000000 +0900
+@@ -222,7 +222,7 @@
+ 		  xscreensaver.h prefs.h remote.h \
+ 		  demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
+ 		  demo-Gtk-conf.h
+-MEN_1		= xscreensaver.man xscreensaver-demo.man \
++MEN_1		= xscreensaver.man \
+ 		  xscreensaver-command.man \
+ 		  xscreensaver-text.man \
+ 		  xscreensaver-getimage.man \
 @@ -288,7 +288,7 @@
  	fi ;								      \
  	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \