[pkgsrc/trunk]: pkgsrc/x11/xscreensaver xscreensaver: don't install with SETU...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d9499b5f640
branches:  trunk
changeset: 333144:2d9499b5f640
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed May 01 02:51:49 2019 +0000

description:
xscreensaver: don't install with SETUID if PAM is enabled

If the (non-default) "pam" option is selected, then don't install this
SETUID, it's not necessary. (Or, to put it differently, do what gnome-
screensaver and mate-screensaver are already doing, which is the same.)

diffstat:

 x11/xscreensaver/Makefile   |  5 ++---
 x11/xscreensaver/options.mk |  3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 20a93ea82fef -r 2d9499b5f640 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Wed May 01 02:37:56 2019 +0000
+++ b/x11/xscreensaver/Makefile Wed May 01 02:51:49 2019 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2018/09/02 20:12:03 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2019/05/01 02:51:49 gutteridge Exp $
 
+PKGREVISION=   1
 COMMENT=       Screen saver and locker for the X window system
 
 CONFLICTS+=    xscreensaver-gnome<4.14
@@ -8,8 +9,6 @@
 .include "options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-SPECIAL_PERMS+=                bin/xscreensaver ${SETUID_ROOT_PERMS}
-
 CONFIGURE_ARGS+=       --without-gtk
 #CONFIGURE_ARGS+=      --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
diff -r 20a93ea82fef -r 2d9499b5f640 x11/xscreensaver/options.mk
--- a/x11/xscreensaver/options.mk       Wed May 01 02:37:56 2019 +0000
+++ b/x11/xscreensaver/options.mk       Wed May 01 02:51:49 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2018/09/02 20:26:59 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2019/05/01 02:51:49 gutteridge Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
 PKG_SUPPORTED_OPTIONS= pam webcollage opengl
@@ -18,6 +18,7 @@
 CONFIGURE_ARGS+=       --without-pam
 # configure should figure out
 #CONFIGURE_ARGS+=      --without-shadow
+SPECIAL_PERMS+=                bin/xscreensaver ${SETUID_ROOT_PERMS}
 .endif
 
 PLIST_SRC+=    PLIST