Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Nov 2013 20:08:04 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332770 - in head/x11/deforaos-locker: . files
Message-ID:  <201311042008.rA4K84T1019560@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Mon Nov  4 20:08:04 2013
New Revision: 332770
URL: http://svnweb.freebsd.org/changeset/ports/332770

Log:
  x11/deforaos-locker: allow staging
  
  - Allow staging
  - Bump port revision for libdesktop update
  - Convert lib depends to new format
  
  PR:		ports/183637
  Submitted by:	maintainer

Added:
  head/x11/deforaos-locker/files/patch-locker.c.diff   (contents, props changed)
Modified:
  head/x11/deforaos-locker/Makefile
  head/x11/deforaos-locker/pkg-plist

Modified: head/x11/deforaos-locker/Makefile
==============================================================================
--- head/x11/deforaos-locker/Makefile	Mon Nov  4 20:06:45 2013	(r332769)
+++ head/x11/deforaos-locker/Makefile	Mon Nov  4 20:08:04 2013	(r332770)
@@ -3,6 +3,7 @@
 
 PORTNAME=	locker
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.defora.org/os/download/download/3703/
 PKGNAMEPREFIX=	deforaos-
@@ -13,19 +14,16 @@ COMMENT=	DeforaOS desktop screensaver
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem \
-		Desktop:${PORTSDIR}/x11/deforaos-libdesktop \
-		Xss:${PORTSDIR}/x11/libXScrnSaver
+LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
+		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
+		libXss.so:${PORTSDIR}/x11/libXScrnSaver
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:${PORTSDIR}/x11/deforaos-panel \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-USE_GNOME=	gtk20 desktopfileutils
-USES=		pkgconfig gettext
+USE_GNOME=	gtk20
+USES=		desktop-file-utils gettext pkgconfig
 MAKE_ARGS+=	PREFIX=${PREFIX}
-MAKE_ENV+=	MANDIR=${MANPREFIX}/man
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
-MAN1=		locker.1 lockerctl.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Added: head/x11/deforaos-locker/files/patch-locker.c.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/deforaos-locker/files/patch-locker.c.diff	Mon Nov  4 20:08:04 2013	(r332770)
@@ -0,0 +1,15 @@
+--- src/locker.c.orig	2013-11-03 22:28:05.640455922 +0100
++++ src/locker.c	2013-11-03 22:30:35.005447608 +0100
+@@ -268,8 +268,10 @@
+ 			GDK_WINDOW_XID(root), ScreenSaverNotifyMask);
+ 	gdk_x11_register_standard_event_type(locker->display, locker->event, 1);
+ 	gdk_window_add_filter(root, _locker_on_filter, locker);
+-	desktop_message_register(LOCKER_CLIENT_MESSAGE, _locker_on_message,
+-			locker);
++  /* listen to desktop messages */
++  gtk_widget_realize(locker->windows[0]);
++  desktop_message_register(locker->windows[0], LOCKER_CLIENT_MESSAGE,
++      _locker_on_message, locker);
+ 	return locker;
+ }
+ 

Modified: head/x11/deforaos-locker/pkg-plist
==============================================================================
--- head/x11/deforaos-locker/pkg-plist	Mon Nov  4 20:06:45 2013	(r332769)
+++ head/x11/deforaos-locker/pkg-plist	Mon Nov  4 20:08:04 2013	(r332770)
@@ -15,9 +15,12 @@ lib/Locker/plugins/openmoko.so
 lib/Locker/plugins/panel.so
 lib/Locker/plugins/suspend.so
 lib/Locker/plugins/systray.so
+man/man1/locker.1.gz
+man/man1/lockerctl.1.gz
 share/applications/locker-settings.desktop
 share/locale/fr/LC_MESSAGES/Locker.mo
 @dirrm include/Desktop/Locker
+@dirrmtry include/Desktop
 @dirrm lib/Locker/auth
 @dirrm lib/Locker/demos
 @dirrm lib/Locker/plugins



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311042008.rA4K84T1019560>