ports/183637: deforaos-locker revision upgrade and staging support

[Olivier Cochard-Labbe]

>Number:         183637
>Category:       ports
>Synopsis:       deforaos-locker revision upgrade and staging support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 03 23:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Cochard-Labbe
>Release:        10.0
>Organization:
>Environment:
FreeBSD orange.bsdrp.net 10.0-BETA2 FreeBSD 10.0-BETA2 #0 r257208M: Sun Oct 27 21:28:39 CET 2013     root at orange.bsdrp.net:/usr/obj/usr/local/BSDRP/BSDRP/FreeBSD/src/sys/PROD  amd64
>Description:
Updating port with staging support and adapted to new deforaos lib version
This PR is number 6 of 6

01 - deforaos-libdesktop 0.0.10
02 - deforaos-keyboard rev1
03 - deforaos-browser 0.4.13
04 - deforaos-player 0.1.6  
05 - deforaos-panel 0.2.18  
06 - deforaos-locker rev1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: x11/deforaos-locker/Makefile
===================================================================
--- x11/deforaos-locker/Makefile	(revision 332601)
+++ x11/deforaos-locker/Makefile	(working copy)
@@ -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 @@
 
 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
+USE_GNOME=	gtk20
 USES=		pkgconfig gettext
 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>
Index: x11/deforaos-locker/files/patch-locker.c.diff
===================================================================
--- x11/deforaos-locker/files/patch-locker.c.diff	(revision 0)
+++ x11/deforaos-locker/files/patch-locker.c.diff	(working copy)
@@ -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;
+ }
+ 

Property changes on: x11/deforaos-locker/files/patch-locker.c.diff
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/deforaos-locker/pkg-plist
===================================================================
--- x11/deforaos-locker/pkg-plist	(revision 332601)
+++ x11/deforaos-locker/pkg-plist	(working copy)
@@ -15,9 +15,12 @@
 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
+ at dirrmtry include/Desktop
 @dirrm lib/Locker/auth
 @dirrm lib/Locker/demos
 @dirrm lib/Locker/plugins


>Release-Note:
>Audit-Trail:
>Unformatted: