cinnamon-screensaver: Various fixes.

[Jonathan Perkin <jperkin%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Tue Jul 31 12:42:10 2018 +0100
Changeset:	378f623eaab44cc0cbf5493daf00a0cf0ba87d9b

Modified Files:
	cinnamon-screensaver/Makefile
	cinnamon-screensaver/PLIST

Log Message:
cinnamon-screensaver: Various fixes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=378f623eaab44cc0cbf5493daf00a0cf0ba87d9b

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

diffstat:
 cinnamon-screensaver/Makefile |  13 ++-
 cinnamon-screensaver/PLIST    | 198 +++++++++++++++++++++---------------------
 2 files changed, 110 insertions(+), 101 deletions(-)

diffs:
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
index 8abdf0c8e4..a7e79030a8 100644
--- a/cinnamon-screensaver/Makefile
+++ b/cinnamon-screensaver/Makefile
@@ -17,6 +17,14 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
 
+PLIST_VARS+=	pam
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=        --disable-pam
+.else
+PLIST.pam=		yes
 CONFIGURE_ARGS+=	--with-pam-prefix=/etc/pam.d \
 			--without-systemd
 
@@ -40,12 +48,12 @@ pamd:
 MAKE_DIRS+=	/etc/pam.d
 CONF_FILES+=	${PREFIX}/share/examples/pam.d/cinnamon-screensaver \
 		/etc/pam.d/cinnamon-screensaver
-
+.endif
 
 BUILD_DEPENDS+=		gettext-m4>=0.14.6:../../devel/gettext-m4
 BUILD_DEPENDS+=		autoconf-archive-[0-9]*:../../devel/autoconf-archive
 
-DEPENDS+=	${PYPKGPREFIX}-xapp>=1.2.0:../../cinnamon/py-xapp
+DEPENDS+=	${PYPKGPREFIX}-xapp>=1.2.0:../../wip/py-xapp
 DEPENDS+=	${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
 
 
@@ -58,6 +66,7 @@ pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/cinnamon-screensaver/PLIST b/cinnamon-screensaver/PLIST
index 27ba992ea1..39e50d93c4 100644
--- a/cinnamon-screensaver/PLIST
+++ b/cinnamon-screensaver/PLIST
@@ -9,44 +9,44 @@ lib/pkgconfig/cscreensaver.pc
 libexec/cinnamon-screensaver-pam-helper
 share/applications/cinnamon-screensaver.desktop
 share/cinnamon-screensaver/__init__.py
-share/cinnamon-screensaver/__pycache__/__init__.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/__init__.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/albumArt.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/albumArt.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/audioPanel.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/audioPanel.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/baseWindow.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/baseWindow.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/clock.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/clock.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/config.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/config.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/constants.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/constants.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/floating.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/floating.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/infoPanel.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/infoPanel.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/manager.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/manager.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/monitorView.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/monitorView.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/passwordEntry.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/passwordEntry.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/playerControl.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/playerControl.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/service.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/service.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/singletons.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/singletons.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/stage.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/stage.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/status.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/status.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/unlock.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/unlock.cpython-36.pyc
-share/cinnamon-screensaver/__pycache__/volumeControl.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/__pycache__/volumeControl.cpython-36.pyc
+share/cinnamon-screensaver/__init__.pyo
+share/cinnamon-screensaver/__init__.pyc
+share/cinnamon-screensaver/albumArt.pyo
+share/cinnamon-screensaver/albumArt.pyc
+share/cinnamon-screensaver/audioPanel.pyo
+share/cinnamon-screensaver/audioPanel.pyc
+share/cinnamon-screensaver/baseWindow.pyo
+share/cinnamon-screensaver/baseWindow.pyc
+share/cinnamon-screensaver/clock.pyo
+share/cinnamon-screensaver/clock.pyc
+share/cinnamon-screensaver/config.pyo
+share/cinnamon-screensaver/config.pyc
+share/cinnamon-screensaver/constants.pyo
+share/cinnamon-screensaver/constants.pyc
+share/cinnamon-screensaver/floating.pyo
+share/cinnamon-screensaver/floating.pyc
+share/cinnamon-screensaver/infoPanel.pyo
+share/cinnamon-screensaver/infoPanel.pyc
+share/cinnamon-screensaver/manager.pyo
+share/cinnamon-screensaver/manager.pyc
+share/cinnamon-screensaver/monitorView.pyo
+share/cinnamon-screensaver/monitorView.pyc
+share/cinnamon-screensaver/passwordEntry.pyo
+share/cinnamon-screensaver/passwordEntry.pyc
+share/cinnamon-screensaver/playerControl.pyo
+share/cinnamon-screensaver/playerControl.pyc
+share/cinnamon-screensaver/service.pyo
+share/cinnamon-screensaver/service.pyc
+share/cinnamon-screensaver/singletons.pyo
+share/cinnamon-screensaver/singletons.pyc
+share/cinnamon-screensaver/stage.pyo
+share/cinnamon-screensaver/stage.pyc
+share/cinnamon-screensaver/status.pyo
+share/cinnamon-screensaver/status.pyc
+share/cinnamon-screensaver/unlock.pyo
+share/cinnamon-screensaver/unlock.pyc
+share/cinnamon-screensaver/volumeControl.pyo
+share/cinnamon-screensaver/volumeControl.pyc
 share/cinnamon-screensaver/albumArt.py
 share/cinnamon-screensaver/audioPanel.py
 share/cinnamon-screensaver/baseWindow.py
@@ -59,32 +59,32 @@ share/cinnamon-screensaver/clock.py
 share/cinnamon-screensaver/config.py
 share/cinnamon-screensaver/constants.py
 share/cinnamon-screensaver/dbusdepot/__init__.py
-share/cinnamon-screensaver/dbusdepot/__pycache__/__init__.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/__init__.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/accountsServiceClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/accountsServiceClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/baseClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/baseClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/cinnamonClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/cinnamonClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/consoleKitClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/consoleKitClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/keybindingHandlerClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/keybindingHandlerClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/loginInterface.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/loginInterface.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/logindClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/logindClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/mediaPlayerWatcher.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/mediaPlayerWatcher.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/nameBlocker.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/nameBlocker.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/screensaverClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/screensaverClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/sessionClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/sessionClient.cpython-36.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/uPowerClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/dbusdepot/__pycache__/uPowerClient.cpython-36.pyc
+share/cinnamon-screensaver/dbusdepot/__init__.pyo
+share/cinnamon-screensaver/dbusdepot/__init__.pyc
+share/cinnamon-screensaver/dbusdepot/accountsServiceClient.pyo
+share/cinnamon-screensaver/dbusdepot/accountsServiceClient.pyc
+share/cinnamon-screensaver/dbusdepot/baseClient.pyo
+share/cinnamon-screensaver/dbusdepot/baseClient.pyc
+share/cinnamon-screensaver/dbusdepot/cinnamonClient.pyo
+share/cinnamon-screensaver/dbusdepot/cinnamonClient.pyc
+share/cinnamon-screensaver/dbusdepot/consoleKitClient.pyo
+share/cinnamon-screensaver/dbusdepot/consoleKitClient.pyc
+share/cinnamon-screensaver/dbusdepot/keybindingHandlerClient.pyo
+share/cinnamon-screensaver/dbusdepot/keybindingHandlerClient.pyc
+share/cinnamon-screensaver/dbusdepot/loginInterface.pyo
+share/cinnamon-screensaver/dbusdepot/loginInterface.pyc
+share/cinnamon-screensaver/dbusdepot/logindClient.pyo
+share/cinnamon-screensaver/dbusdepot/logindClient.pyc
+share/cinnamon-screensaver/dbusdepot/mediaPlayerWatcher.pyo
+share/cinnamon-screensaver/dbusdepot/mediaPlayerWatcher.pyc
+share/cinnamon-screensaver/dbusdepot/nameBlocker.pyo
+share/cinnamon-screensaver/dbusdepot/nameBlocker.pyc
+share/cinnamon-screensaver/dbusdepot/screensaverClient.pyo
+share/cinnamon-screensaver/dbusdepot/screensaverClient.pyc
+share/cinnamon-screensaver/dbusdepot/sessionClient.pyo
+share/cinnamon-screensaver/dbusdepot/sessionClient.pyc
+share/cinnamon-screensaver/dbusdepot/uPowerClient.pyo
+share/cinnamon-screensaver/dbusdepot/uPowerClient.pyc
 share/cinnamon-screensaver/dbusdepot/accountsServiceClient.py
 share/cinnamon-screensaver/dbusdepot/baseClient.py
 share/cinnamon-screensaver/dbusdepot/cinnamonClient.py
@@ -101,8 +101,8 @@ share/cinnamon-screensaver/floating.py
 share/cinnamon-screensaver/infoPanel.py
 share/cinnamon-screensaver/manager.py
 share/cinnamon-screensaver/monitorView.py
-share/cinnamon-screensaver/pamhelper/__pycache__/authClient.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/pamhelper/__pycache__/authClient.cpython-36.pyc
+share/cinnamon-screensaver/pamhelper/authClient.pyo
+share/cinnamon-screensaver/pamhelper/authClient.pyc
 share/cinnamon-screensaver/pamhelper/authClient.py
 share/cinnamon-screensaver/passwordEntry.py
 share/cinnamon-screensaver/playerControl.py
@@ -117,24 +117,24 @@ share/cinnamon-screensaver/stage.py
 share/cinnamon-screensaver/status.py
 share/cinnamon-screensaver/unlock.py
 share/cinnamon-screensaver/util/__init__.py
-share/cinnamon-screensaver/util/__pycache__/__init__.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/__init__.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/eventHandler.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/eventHandler.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/fader.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/fader.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/focusNavigator.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/focusNavigator.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/grabHelper.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/grabHelper.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/keybindings.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/keybindings.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/settings.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/settings.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/trackers.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/trackers.cpython-36.pyc
-share/cinnamon-screensaver/util/__pycache__/utils.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/util/__pycache__/utils.cpython-36.pyc
+share/cinnamon-screensaver/util/__init__.pyo
+share/cinnamon-screensaver/util/__init__.pyc
+share/cinnamon-screensaver/util/eventHandler.pyo
+share/cinnamon-screensaver/util/eventHandler.pyc
+share/cinnamon-screensaver/util/fader.pyo
+share/cinnamon-screensaver/util/fader.pyc
+share/cinnamon-screensaver/util/focusNavigator.pyo
+share/cinnamon-screensaver/util/focusNavigator.pyc
+share/cinnamon-screensaver/util/grabHelper.pyo
+share/cinnamon-screensaver/util/grabHelper.pyc
+share/cinnamon-screensaver/util/keybindings.pyo
+share/cinnamon-screensaver/util/keybindings.pyc
+share/cinnamon-screensaver/util/settings.pyo
+share/cinnamon-screensaver/util/settings.pyc
+share/cinnamon-screensaver/util/trackers.pyo
+share/cinnamon-screensaver/util/trackers.pyc
+share/cinnamon-screensaver/util/utils.pyo
+share/cinnamon-screensaver/util/utils.pyc
 share/cinnamon-screensaver/util/eventHandler.py
 share/cinnamon-screensaver/util/fader.py
 share/cinnamon-screensaver/util/focusNavigator.py
@@ -145,20 +145,20 @@ share/cinnamon-screensaver/util/trackers.py
 share/cinnamon-screensaver/util/utils.py
 share/cinnamon-screensaver/volumeControl.py
 share/cinnamon-screensaver/widgets/__init__.py
-share/cinnamon-screensaver/widgets/__pycache__/__init__.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/__init__.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/framedImage.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/framedImage.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/marqueeLabel.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/marqueeLabel.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/notificationWidget.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/notificationWidget.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/powerWidget.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/powerWidget.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/transparentButton.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/transparentButton.cpython-36.pyc
-share/cinnamon-screensaver/widgets/__pycache__/volumeSlider.cpython-36.opt-1.pyc
-share/cinnamon-screensaver/widgets/__pycache__/volumeSlider.cpython-36.pyc
+share/cinnamon-screensaver/widgets/__init__.pyo
+share/cinnamon-screensaver/widgets/__init__.pyc
+share/cinnamon-screensaver/widgets/framedImage.pyo
+share/cinnamon-screensaver/widgets/framedImage.pyc
+share/cinnamon-screensaver/widgets/marqueeLabel.pyo
+share/cinnamon-screensaver/widgets/marqueeLabel.pyc
+share/cinnamon-screensaver/widgets/notificationWidget.pyo
+share/cinnamon-screensaver/widgets/notificationWidget.pyc
+share/cinnamon-screensaver/widgets/powerWidget.pyo
+share/cinnamon-screensaver/widgets/powerWidget.pyc
+share/cinnamon-screensaver/widgets/transparentButton.pyo
+share/cinnamon-screensaver/widgets/transparentButton.pyc
+share/cinnamon-screensaver/widgets/volumeSlider.pyo
+share/cinnamon-screensaver/widgets/volumeSlider.pyc
 share/cinnamon-screensaver/widgets/framedImage.py
 share/cinnamon-screensaver/widgets/marqueeLabel.py
 share/cinnamon-screensaver/widgets/notificationWidget.py
@@ -166,7 +166,7 @@ share/cinnamon-screensaver/widgets/powerWidget.py
 share/cinnamon-screensaver/widgets/transparentButton.py
 share/cinnamon-screensaver/widgets/volumeSlider.py
 share/dbus-1/services/org.cinnamon.ScreenSaver.service
-share/examples/pam.d/cinnamon-screensaver
+${PLIST.pam}share/examples/pam.d/cinnamon-screensaver
 share/gir-1.0/CScreensaver-1.0.gir
 share/icons/hicolor/scalable/actions/screensaver-switch-users-symbolic.svg
 share/icons/hicolor/scalable/actions/screensaver-unlock-symbolic.svg