From owner-svn-ports-all@FreeBSD.ORG Thu Apr 25 16:52:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 69B8A7A4; Thu, 25 Apr 2013 16:52:06 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5BA471EC5; Thu, 25 Apr 2013 16:52:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3PGq6ur044930; Thu, 25 Apr 2013 16:52:06 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3PGq5Nh044923; Thu, 25 Apr 2013 16:52:05 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201304251652.r3PGq5Nh044923@svn.freebsd.org> From: Olivier Duchateau Date: Thu, 25 Apr 2013 16:52:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316522 - in head/x11-wm/xfce4-session: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 16:52:06 -0000 Author: olivierd Date: Thu Apr 25 16:52:05 2013 New Revision: 316522 URL: http://svnweb.freebsd.org/changeset/ports/316522 Log: - 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@ Added: head/x11-wm/xfce4-session/files/patch-configure (contents, props changed) Modified: head/x11-wm/xfce4-session/Makefile head/x11-wm/xfce4-session/files/patch-scripts_xflock4 (contents, props changed) head/x11-wm/xfce4-session/pkg-plist Modified: head/x11-wm/xfce4-session/Makefile ============================================================================== --- head/x11-wm/xfce4-session/Makefile Thu Apr 25 15:36:19 2013 (r316521) +++ head/x11-wm/xfce4-session/Makefile Thu Apr 25 16:52:05 2013 (r316522) @@ -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 .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 Added: head/x11-wm/xfce4-session/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/xfce4-session/files/patch-configure Thu Apr 25 16:52:05 2013 (r316522) @@ -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 Modified: head/x11-wm/xfce4-session/files/patch-scripts_xflock4 ============================================================================== --- head/x11-wm/xfce4-session/files/patch-scripts_xflock4 Thu Apr 25 15:36:19 2013 (r316521) +++ head/x11-wm/xfce4-session/files/patch-scripts_xflock4 Thu Apr 25 16:52:05 2013 (r316522) @@ -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 Modified: head/x11-wm/xfce4-session/pkg-plist ============================================================================== --- head/x11-wm/xfce4-session/pkg-plist Thu Apr 25 15:36:19 2013 (r316521) +++ head/x11-wm/xfce4-session/pkg-plist Thu Apr 25 16:52:05 2013 (r316522) @@ -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