[pkgsrc/trunk]: pkgsrc x11/xAscreensaver-demo: remove, merged into xscreensaver

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c919b9210a68
branches:  trunk
changeset: 374268:c919b9210a68
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 17 15:48:21 2022 +0000

description:
x11/xAscreensaver-demo: remove, merged into xscreensaver

diffstat:

 doc/CHANGES-2022                                      |   3 +-
 x11/Makefile                                          |   3 +-
 x11/xscreensaver-demo/DESCR                           |   3 -
 x11/xscreensaver-demo/Makefile                        |  36 -------------------
 x11/xscreensaver-demo/PLIST                           |  12 ------
 x11/xscreensaver-demo/files/xscreensaver-demo.desktop |   7 ---
 6 files changed, 3 insertions(+), 61 deletions(-)

diffs (105 lines):

diff -r 133a2577679a -r c919b9210a68 doc/CHANGES-2022
--- a/doc/CHANGES-2022  Thu Feb 17 15:46:52 2022 +0000
+++ b/doc/CHANGES-2022  Thu Feb 17 15:48:21 2022 +0000
@@ -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 @@
        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]
diff -r 133a2577679a -r c919b9210a68 x11/Makefile
--- a/x11/Makefile      Thu Feb 17 15:46:52 2022 +0000
+++ b/x11/Makefile      Thu Feb 17 15:48:21 2022 +0000
@@ -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+=       xrootconsole
 SUBDIR+=       xscope
 SUBDIR+=       xscreensaver
-SUBDIR+=       xscreensaver-demo
 SUBDIR+=       xscribble
 SUBDIR+=       xscript
 SUBDIR+=       xsel
diff -r 133a2577679a -r c919b9210a68 x11/xscreensaver-demo/DESCR
--- a/x11/xscreensaver-demo/DESCR       Thu Feb 17 15:46:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-This package provides the xscreensaver-demo utility that comes with
-xscreensaver, built against GTK v2.  It lets you preview screen
-savers and configure the daemon.
diff -r 133a2577679a -r c919b9210a68 x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile    Thu Feb 17 15:46:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.90 2021/12/08 16:07:18 adam Exp $
-
-PKGNAME=       ${DISTNAME:S/-/-demo-/}
-PKGREVISION=   2
-COMMENT=       Demo viewer and configuration tool for xscreensaver
-
-CONFLICTS+=    xscreensaver<4.14 xscreensaver-gnome-[0-9]*
-
-.include "../../x11/xscreensaver/Makefile.common"
-
-USE_TOOLS+=            pkg-config
-
-CONFIGURE_ARGS+=       --with-gtk=${BUILDLINK_PREFIX.gtk2}
-CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
-
-BUILD_DIRS=            utils driver
-INSTALL_DIRS=          driver
-INSTALL_TARGET=                install-gnome
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/applications
-
-post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo \
-           ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
-           ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
-       ${INSTALL_DATA} ${FILESDIR}/xscreensaver-demo.desktop \
-           ${DESTDIR}${PREFIX}/share/applications/xscreensaver-demo.desktop
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
-.include "../../x11/xscreensaver/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 133a2577679a -r c919b9210a68 x11/xscreensaver-demo/PLIST
--- a/x11/xscreensaver-demo/PLIST       Thu Feb 17 15:46:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2021/01/04 12:24:10 wiz Exp $
-bin/xscreensaver-demo
-man/man1/xscreensaver-demo.1
-share/applications/xscreensaver-demo.desktop
-share/pixmaps/xscreensaver.xpm
-share/xscreensaver/ui/screensaver-cmndln.png
-share/xscreensaver/ui/screensaver-colorselector.png
-share/xscreensaver/ui/screensaver-diagnostic.png
-share/xscreensaver/ui/screensaver-locking.png
-share/xscreensaver/ui/screensaver-power.png
-share/xscreensaver/ui/screensaver-snap.png
-share/xscreensaver/ui/xscreensaver-demo.ui
diff -r 133a2577679a -r c919b9210a68 x11/xscreensaver-demo/files/xscreensaver-demo.desktop
--- a/x11/xscreensaver-demo/files/xscreensaver-demo.desktop     Thu Feb 17 15:46:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Screensaver
-Exec=xscreensaver-demo
-Icon=xscreensaver
-Terminal=false
-Categories=Settings;