Sun Nov 24 21:54:52 2019 UTC ()
xscreensaver*: remove libXxf86misc inclusion

xscreensaver compiles without it, and the server side support code was
removed 11 years ago.

Bump PKGREVISION.


(wiz)
diff -r1.118 -r1.119 pkgsrc/x11/xscreensaver/Makefile
diff -r1.77 -r1.78 pkgsrc/x11/xscreensaver-demo/Makefile
cvs diff -r1.118 -r1.119 pkgsrc/x11/xscreensaver/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/Makefile 2019/08/11 13:25:21 1.118
+++ pkgsrc/x11/xscreensaver/Makefile 2019/11/24 21:54:52 1.119
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.118 2019/08/11 13:25:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.119 2019/11/24 21:54:52 wiz Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 3
4COMMENT= Screen saver and locker for the X window system 4COMMENT= Screen saver and locker for the X window system
5 5
6CONFLICTS+= xscreensaver-gnome<4.14 6CONFLICTS+= xscreensaver-gnome<4.14
7 7
8.include "Makefile.common" 8.include "Makefile.common"
9.include "options.mk" 9.include "options.mk"
10.include "../../textproc/libxml2/buildlink3.mk" 10.include "../../textproc/libxml2/buildlink3.mk"
11 11
12CONFIGURE_ARGS+= --without-gtk 12CONFIGURE_ARGS+= --without-gtk
13#CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 13#CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config 14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
15 15
16EGDIR= ${PREFIX}/share/examples/xscreensaver 16EGDIR= ${PREFIX}/share/examples/xscreensaver
17MESSAGE_SUBST+= EGDIR=${EGDIR:Q} 17MESSAGE_SUBST+= EGDIR=${EGDIR:Q}
18 18
19INSTALLATION_DIRS= ${EGDIR}/pam.d 19INSTALLATION_DIRS= ${EGDIR}/pam.d
20 20
21post-install: 21post-install:
22 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \ 22 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
23 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD 23 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
24 24
25.include "../../graphics/png/buildlink3.mk" 25.include "../../graphics/png/buildlink3.mk"
26.include "../../x11/libXScrnSaver/buildlink3.mk" 26.include "../../x11/libXScrnSaver/buildlink3.mk"
27.include "../../x11/libXext/buildlink3.mk" 27.include "../../x11/libXext/buildlink3.mk"
28.include "../../x11/libXinerama/buildlink3.mk" 28.include "../../x11/libXinerama/buildlink3.mk"
29.include "../../x11/libXpm/buildlink3.mk" 29.include "../../x11/libXpm/buildlink3.mk"
30.include "../../x11/libXxf86misc/buildlink3.mk" 
31.include "../../x11/libXxf86vm/buildlink3.mk" 30.include "../../x11/libXxf86vm/buildlink3.mk"
32.include "../../x11/libXft/buildlink3.mk" 31.include "../../x11/libXft/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.77 -r1.78 pkgsrc/x11/xscreensaver-demo/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver-demo/Attic/Makefile 2019/08/11 13:25:21 1.77
+++ pkgsrc/x11/xscreensaver-demo/Attic/Makefile 2019/11/24 21:54:52 1.78
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.77 2019/08/11 13:25:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.78 2019/11/24 21:54:52 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-demo-/} 3PKGNAME= ${DISTNAME:S/-/-demo-/}
4PKGREVISION= 5 4PKGREVISION= 6
5COMMENT= Demo viewer and configuration tool for xscreensaver 5COMMENT= Demo viewer and configuration tool for xscreensaver
6 6
7CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]* 7CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*
8 8
9.include "../../x11/xscreensaver/Makefile.common" 9.include "../../x11/xscreensaver/Makefile.common"
10 10
11USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
12 12
13CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2} 13CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config 14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
15 15
16BUILD_DIRS= utils driver 16BUILD_DIRS= utils driver
17INSTALL_DIRS= driver 17INSTALL_DIRS= driver