[pkgsrc/trunk]: pkgsrc/x11 Install xscreensaver-demo man page with xscreensav...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1526faf0880b
branches:  trunk
changeset: 492898:1526faf0880b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Apr 21 15:01:43 2005 +0000

description:
Install xscreensaver-demo man page with xscreensaver-demo package, not
with xscreeensaver package. Bump PKGREVISION for both.

Patch from Kouichirou Hiratsuka.

diffstat:

 x11/xscreensaver-demo/Makefile    |   5 ++++-
 x11/xscreensaver-demo/PLIST       |   3 ++-
 x11/xscreensaver/Makefile         |   4 ++--
 x11/xscreensaver/PLIST            |   3 +--
 x11/xscreensaver/distinfo         |   4 ++--
 x11/xscreensaver/patches/patch-ad |  13 +++++++++++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diffs (109 lines):

diff -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile    Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver-demo/Makefile    Thu Apr 21 15:01:43 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:16 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/21 15:01:43 wiz Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-demo-/}
+PKREVISION=    1
 COMMENT=       Demo viewer and configuration tool for xscreensaver
 
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-gnome-[0-9]*
@@ -20,6 +21,8 @@
 
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
+                      ${PREFIX}/man/man1/xscreensaver-demo.1
 
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver-demo/PLIST
--- a/x11/xscreensaver-demo/PLIST       Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver-demo/PLIST       Thu Apr 21 15:01:43 2005 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/24 13:55:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/04/21 15:01:43 wiz Exp $
 bin/xscreensaver-demo
+man/man1/xscreensaver-demo.1
 share/pixmaps/xscreensaver.xpm
 share/xscreensaver/glade/screensaver-cmndln.png
 share/xscreensaver/glade/screensaver-colorselector.png
diff -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver/Makefile Thu Apr 21 15:01:43 2005 +0000
@@ -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 @@
 # 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 -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver/PLIST    Thu Apr 21 15:01:43 2005 +0000
@@ -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/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 -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver/distinfo Thu Apr 21 15:01:43 2005 +0000
@@ -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 @@
 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 -r 58c858a2fb61 -r 1526faf0880b x11/xscreensaver/patches/patch-ad
--- a/x11/xscreensaver/patches/patch-ad Thu Apr 21 14:56:19 2005 +0000
+++ b/x11/xscreensaver/patches/patch-ad Thu Apr 21 15:01:43 2005 +0000
@@ -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 ;    \