pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mate-screensaver: fix build on Darwin.



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Mon Apr 11 13:10:26 2016 +0200
Changeset:	981df18ca690d7121e08a5bb05bd1269c57c8c93

Modified Files:
	mate-screensaver/Makefile
	mate-screensaver/PLIST
	mate-screensaver/distinfo
Added Files:
	mate-screensaver/patches/patch-src_gs-auth-pam.c

Log Message:
mate-screensaver: fix build on Darwin.

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

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

diffstat:
 mate-screensaver/Makefile                        | 16 +++++++++++++---
 mate-screensaver/PLIST                           |  2 +-
 mate-screensaver/distinfo                        |  1 +
 mate-screensaver/patches/patch-src_gs-auth-pam.c | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diffs:
diff --git a/mate-screensaver/Makefile b/mate-screensaver/Makefile
index 232a88f..2f0d582 100644
--- a/mate-screensaver/Makefile
+++ b/mate-screensaver/Makefile
@@ -12,8 +12,6 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 CONFLICTS+=	gnome-screensaver-[0-9]*
 
-DEPENDS+=	consolekit-[0-9]*:../../sysutils/consolekit
-
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -35,7 +33,12 @@ CONF_FILES+=	${PREFIX}/share/examples/mate-screensaver/xdg/autostart/mate-screen
 CONF_FILES+=	${PREFIX}/share/examples/mate-screensaver/xdg/menus/mate-screensavers.menu \
 		${PKG_SYSCONFDIR}/xdg/menus/mate-screensavers.menu
 
-DEPENDS+=	pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=		pam
+
+.if ${OPSYS} != "Darwin"
+DEPENDS+=		pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
 INSTALLATION_DIRS+=	${PREFIX}/share/examples/pam.d
 
 post-extract:
@@ -46,6 +49,8 @@ SUBST_STAGE.pam-conf=	post-configure
 SUBST_FILES.pam-conf=	${WRKDIR}/mate-screensaver.pam
 SUBST_VARS.pam-conf=	PREFIX
 
+PLIST.pam=		yes
+
 post-install:
 	${TEST} -f ${DESTDIR}${PREFIX}/share/examples/pam.d/mate-screensaver || \
 		${INSTALL_DATA} ${WRKDIR}/mate-screensaver.pam ${DESTDIR}${PREFIX}/share/examples/pam.d/mate-screensaver
@@ -54,6 +59,11 @@ MAKE_DIRS+=	/etc/pam.d
 CONF_FILES+=	${PREFIX}/share/examples/pam.d/mate-screensaver \
 		/etc/pam.d/mate-screensaver
 
+.include "../../mk/bsd.prefs.mk"
+
+DEPENDS+=	consolekit-[0-9]*:../../sysutils/consolekit
+.endif
+
 .include "../../devel/glib2/schemas.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/mate-desktop/buildlink3.mk"
diff --git a/mate-screensaver/PLIST b/mate-screensaver/PLIST
index 0d018b5..3865592 100644
--- a/mate-screensaver/PLIST
+++ b/mate-screensaver/PLIST
@@ -32,7 +32,7 @@ share/dbus-1/services/org.mate.ScreenSaver.service
 share/desktop-directories/mate-screensaver.directory
 share/examples/mate-screensaver/xdg/autostart/mate-screensaver.desktop
 share/examples/mate-screensaver/xdg/menus/mate-screensavers.menu
-share/examples/pam.d/mate-screensaver
+${PLIST.pam}share/examples/pam.d/mate-screensaver
 share/glib-2.0/schemas/org.mate.screensaver.gschema.xml
 share/locale/am/LC_MESSAGES/mate-screensaver.mo
 share/locale/ar/LC_MESSAGES/mate-screensaver.mo
diff --git a/mate-screensaver/distinfo b/mate-screensaver/distinfo
index d601858..58ee351 100644
--- a/mate-screensaver/distinfo
+++ b/mate-screensaver/distinfo
@@ -4,3 +4,4 @@ SHA1 (mate-screensaver-1.12.0.tar.xz) = 6930459af0d0f116861696265faf5f0807285bcf
 RMD160 (mate-screensaver-1.12.0.tar.xz) = 26c932d7183b2f945e8e96a9b355b7eef0fe42e0
 SHA512 (mate-screensaver-1.12.0.tar.xz) = 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d
 Size (mate-screensaver-1.12.0.tar.xz) = 4868924 bytes
+SHA1 (patch-src_gs-auth-pam.c) = 7b9ad4af83d21c4d5090cd2fa01ca25468cd7e49
diff --git a/mate-screensaver/patches/patch-src_gs-auth-pam.c b/mate-screensaver/patches/patch-src_gs-auth-pam.c
new file mode 100644
index 0000000..c476639
--- /dev/null
+++ b/mate-screensaver/patches/patch-src_gs-auth-pam.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Darwin build fix
+XXX Fix properly
+
+--- src/gs-auth-pam.c.orig	2015-10-06 15:32:23.000000000 +0000
++++ src/gs-auth-pam.c
+@@ -526,7 +526,9 @@ gs_auth_thread_func (int auth_operation_
+ 
+ 	status = pam_authenticate (pam_handle, flags);
+ 
++#ifndef __APPLE__
+ 	sigtimedwait (&set, NULL, &timeout);
++#endif
+ 	unblock_sigchld ();
+ 
+ 	if (gs_auth_get_verbose ())


Home | Main Index | Thread Index | Old Index