From owner-svn-ports-head@FreeBSD.ORG Sat Jan 3 17:24:10 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9CDED817; Sat, 3 Jan 2015 17:24:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7EA5864AED; Sat, 3 Jan 2015 17:24:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t03HOA7v062614; Sat, 3 Jan 2015 17:24:10 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t03HOATw062613; Sat, 3 Jan 2015 17:24:10 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201501031724.t03HOATw062613@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Sat, 3 Jan 2015 17:24:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376142 - in head/x11-wm/xfce4: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jan 2015 17:24:10 -0000 Author: olivierd Date: Sat Jan 3 17:24:09 2015 New Revision: 376142 URL: https://svnweb.freebsd.org/changeset/ports/376142 QAT: https://qat.redports.org/buildarchive/r376142/ Log: - GNOME is default icons theme [1] - Sort OPTIONS_* - Rewrite description for applications - Replace x11/gdm by x11/slim Gdm requires x11/gnome-shell and others GNOME components. Some environments variables are also missing in xfce4-session - Bump PORTREVISION PR: 183690 [1] Requested by: Rostislav Krasny Deleted: head/x11-wm/xfce4/files/ Modified: head/x11-wm/xfce4/Makefile Modified: head/x11-wm/xfce4/Makefile ============================================================================== --- head/x11-wm/xfce4/Makefile Sat Jan 3 17:21:22 2015 (r376141) +++ head/x11-wm/xfce4/Makefile Sat Jan 3 17:24:09 2015 (r376142) @@ -3,7 +3,7 @@ PORTNAME= xfce PORTVERSION= 4.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm xfce MASTER_SITES= # empty DISTFILES= # empty @@ -12,14 +12,15 @@ EXTRACT_ONLY= # empty MAINTAINER= xfce@FreeBSD.org COMMENT= The "meta-port" for the Xfce Desktop Environment -OPTIONS_DEFINE= ICONS ORAGE MOUSEPAD TERMINAL APPFINDER MIXER PRINT SQUEEZE GDM NOTIFY XPM -OPTIONS_DEFAULT= ICONS ORAGE MOUSEPAD TERMINAL APPFINDER NOTIFY -ORAGE_DESC= Install the Xfce calendar application -MOUSEPAD_DESC= Install the Xfce text editor -TERMINAL_DESC= Install the Xfce terminal application -APPFINDER_DESC= Install the Xfce application finder -SQUEEZE_DESC= Install the Xfce archiver application -XPM_DESC= Install the Xfce power manager +OPTIONS_DEFINE= APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM +OPTIONS_DEFAULT= APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL +ORAGE_DESC= Calendar +MOUSEPAD_DESC= Text editor +TERMINAL_DESC= Terminal emulator +APPFINDER_DESC= Launcher and finder +SQUEEZE_DESC= Archive manager +XPM_DESC= Power manager +SLIM_DESC= SLiM, login manager RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \ @@ -34,15 +35,8 @@ LATEST_LINK= xfce4 NO_MTREE= yes .include -.if ${PORT_OPTIONS:MGDM} -RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm -REINPLACE_ARGS= -i "" -PLIST_FILES= etc/gdm/Sessions/XFce4 \ - etc/dm/Sessions/XFce4.desktop -.endif - .if ${PORT_OPTIONS:MICONS} -RUN_DEPENDS+= icons-tango-extras>=0.1.0:${PORTSDIR}/x11-themes/icons-tango-extras +RUN_DEPENDS+= gnome-icon-theme>=3.12.0:${PORTSDIR}/misc/gnome-icon-theme .endif .if ${PORT_OPTIONS:MORAGE} @@ -81,19 +75,10 @@ RUN_DEPENDS+= xfce4-notifyd-config:${POR RUN_DEPENDS+= xfce4-power-manager:${PORTSDIR}/sysutils/xfce4-power-manager .endif -do-install: # empty - -post-install: -.if ${PORT_OPTIONS:MGDM} -.for dir in dm gdm - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/${dir}/Sessions -.endfor - @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 \ - ${STAGEDIR}${PREFIX}/etc/gdm/Sessions - @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop \ - ${STAGEDIR}${PREFIX}/etc/dm/Sessions - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ - ${STAGEDIR}${PREFIX}/etc/dm/Sessions/XFce4.desktop +.if ${PORT_OPTIONS:MSLIM} +RUN_DEPENDS+= slim:${PORTSDIR}/x11/slim .endif +do-install: # empty + .include