CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 17 15:48:21 UTC 2022

Modified Files:
        pkgsrc/doc: CHANGES-2022
        pkgsrc/x11: Makefile
Removed Files:
        pkgsrc/x11/xscreensaver-demo: DESCR Makefile PLIST
        pkgsrc/x11/xscreensaver-demo/files: xscreensaver-demo.desktop

Log Message:
x11/xAscreensaver-demo: remove, merged into xscreensaver


To generate a diff of this commit:
cvs rdiff -u -r1.1041 -r1.1042 pkgsrc/doc/CHANGES-2022
cvs rdiff -u -r1.952 -r1.953 pkgsrc/x11/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xscreensaver-demo/DESCR
cvs rdiff -u -r1.90 -r0 pkgsrc/x11/xscreensaver-demo/Makefile
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/xscreensaver-demo/PLIST
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/xscreensaver-demo/files/xscreensaver-demo.desktop

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2022
diff -u pkgsrc/doc/CHANGES-2022:1.1041 pkgsrc/doc/CHANGES-2022:1.1042
--- pkgsrc/doc/CHANGES-2022:1.1041      Thu Feb 17 15:45:33 2022
+++ pkgsrc/doc/CHANGES-2022     Thu Feb 17 15:48:21 2022
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.1041 2022/02/17 15:45:33 tpaul Exp $
+$NetBSD: CHANGES-2022,v 1.1042 2022/02/17 15:48:21 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2022:
 
@@ -1366,3 +1366,4 @@ Changes to the packages collection and i
        Removed devel/py-hash [wiz 2022-02-17]
        Updated sysutils/findutils to 4.9.0 [wiz 2022-02-17]
        Updated devel/php-composer to 2.2.6 [tpaul 2022-02-17]
+       Removed x11/xscreensaver-demo successor x11/xscreensaver [wiz 2022-02-17]

Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.952 pkgsrc/x11/Makefile:1.953
--- pkgsrc/x11/Makefile:1.952   Tue Jan 18 19:25:56 2022
+++ pkgsrc/x11/Makefile Thu Feb 17 15:48:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.952 2022/01/18 19:25:56 rhialto Exp $
+# $NetBSD: Makefile,v 1.953 2022/02/17 15:48:21 wiz Exp $
 #
 
 COMMENT=       Packages to support the X Window System
@@ -671,7 +671,6 @@ SUBDIR+=    xrestop
 SUBDIR+=       xrootconsole
 SUBDIR+=       xscope
 SUBDIR+=       xscreensaver
-SUBDIR+=       xscreensaver-demo
 SUBDIR+=       xscribble
 SUBDIR+=       xscript
 SUBDIR+=       xsel