From nobody@FreeBSD.org  Sun Nov  3 23:16:54 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 66F4F34C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Nov 2013 23:16:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 525E82941
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Nov 2013 23:16:54 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rA3NGsIE084393
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 3 Nov 2013 23:16:54 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rA3NGsU1084392;
	Sun, 3 Nov 2013 23:16:54 GMT
	(envelope-from nobody)
Message-Id: <201311032316.rA3NGsU1084392@oldred.freebsd.org>
Date: Sun, 3 Nov 2013 23:16:54 GMT
From: Olivier Cochard-Labbe <olivier@cochard.me>
To: freebsd-gnats-submit@FreeBSD.org
Subject: deforaos-locker revision upgrade and staging support
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183637
>Category:       ports
>Synopsis:       x11/deforaos-locker revision upgrade and staging support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 03 23:20:01 UTC 2013
>Closed-Date:    Mon Nov 04 20:08:09 UTC 2013
>Last-Modified:  Mon Nov  4 20:10:00 UTC 2013
>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@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
+@dirrmtry include/Desktop
 @dirrm lib/Locker/auth
 @dirrm lib/Locker/demos
 @dirrm lib/Locker/plugins


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Mon Nov 4 11:09:38 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183637 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Mon Nov 4 20:08:08 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183637 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183637: commit references a PR
Date: Mon,  4 Nov 2013 20:08:11 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
