- Add delay when x11/slock is used (xflock4 script)

While I'm here,
- Adopt USES for desktop-file-utils, gettext, and athfix
- Add patch when NLS is unset

PR:		178090
Submitted by:	tijl@

4 files changed, 26 insertions, 10 deletions

diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index c924ed11c2a9..18dbbd2f90a6 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -24,15 +24,15 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
-USES=		pkgconfig
+USE_GNOME=	gtk20 glib20 intltool intlhack
+USES=		desktop-file-utils pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_XORG=	x11 sm ice
 
 CONFIGURE_ARGS+=--enable-legacy-sm \
 		--disable-libgnome-keyring \
-		--with-xsession-prefix=${LOCALBASE}
+		--with-xsession-prefix=${PREFIX}
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -46,7 +46,7 @@ PLIST_SUB=	VERSION="4.6"
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
+USES+=	gettext
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
 .else
@@ -62,6 +62,5 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
-	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/files/patch-configure b/x11-wm/xfce4-session/files/patch-configure
new file mode 100644
index 000000000000..aa31d0998179
--- /dev/null
+++ b/x11-wm/xfce4-session/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2012-04-28 20:43:34.000000000 +0000
++++ ./configure	2013-04-24 23:04:07.000000000 +0000
+@@ -14200,7 +14200,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
index 710df27a036f..797fb7b189f3 100644
--- a/x11-wm/xfce4-session/files/patch-scripts_xflock4
+++ b/x11-wm/xfce4-session/files/patch-scripts_xflock4
@@ -1,5 +1,5 @@
---- scripts/xflock4.orig	2012-04-28 22:43:27.000000000 +0200
-+++ scripts/xflock4	2012-05-16 22:18:05.000000000 +0200
+--- scripts/xflock4.orig	2012-04-28 20:43:27.000000000 +0000
++++ scripts/xflock4	2013-04-24 19:55:56.000000000 +0000
 @@ -21,7 +21,7 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
@@ -9,3 +9,11 @@
  export PATH
  
  # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
+@@ -41,6 +41,7 @@
+     if command -v -- $1 >/dev/null 2>&1; then
+         $lock_cmd >/dev/null 2>&1 &
+ 	# turn off display backlight:
++	sleep 1
+ 	xset dpms force off
+         exit
+     fi
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index c2a9f67f590c..953de0ef2852 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -144,5 +144,3 @@ share/themes/Default/balou/themerc
 @dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 @dirrmtry etc/xdg/xfce4/xfconf
 @dirrmtry etc/xdg/xfce4
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true