From owner-svn-ports-all@FreeBSD.ORG Sun Nov 2 09:44:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 439B9230; Sun, 2 Nov 2014 09:44:03 +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 2EC14F88; Sun, 2 Nov 2014 09:44:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA29i3m3005725; Sun, 2 Nov 2014 09:44:03 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA29i2qw005720; Sun, 2 Nov 2014 09:44:02 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201411020944.sA29i2qw005720@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 2 Nov 2014 09:44:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372060 - in head/x11/slim: . 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.18-1 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: Sun, 02 Nov 2014 09:44:03 -0000 Author: madpilot Date: Sun Nov 2 09:44:01 2014 New Revision: 372060 URL: https://svnweb.freebsd.org/changeset/ports/372060 QAT: https://qat.redports.org/buildarchive/r372060/ Log: - Modify sample config to not listen on the net by default [1] - Fix paths in man page [2] - While here, silence some portlint warnings and modernize plist PR: 194252 [1], 194518 [2] Submitted by: uffe at uffe.org [1] adrian@ [2] Approved by: Henry Hu (maintainer) Modified: head/x11/slim/Makefile head/x11/slim/files/patch-slim.1 (contents, props changed) head/x11/slim/files/patch-slim.conf head/x11/slim/pkg-plist Modified: head/x11/slim/Makefile ============================================================================== --- head/x11/slim/Makefile Sun Nov 2 09:37:38 2014 (r372059) +++ head/x11/slim/Makefile Sun Nov 2 09:44:01 2014 (r372060) @@ -3,7 +3,7 @@ PORTNAME= slim PORTVERSION= 1.3.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios @@ -23,8 +23,9 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/de USES= cmake pkgconfig USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \ - xrender xt + xrender xt USE_RC_SUBR= slim +USE_LDCONFIG= yes SUB_FILES= pkg-message CMAKE_ARGS= -DUSE_CONSOLEKIT=yes \ @@ -57,7 +58,7 @@ post-patch: @${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/slim.conf.sample - @${REINPLACE_CMD} -e 's,/etc/slim.conf,${PREFIX}&,' \ + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/slim.1 post-install: Modified: head/x11/slim/files/patch-slim.1 ============================================================================== --- head/x11/slim/files/patch-slim.1 Sun Nov 2 09:37:38 2014 (r372059) +++ head/x11/slim/files/patch-slim.1 Sun Nov 2 09:44:01 2014 (r372060) @@ -1,8 +1,12 @@ -$FreeBSD$ - ---- slim.1.orig 2014-03-10 21:18:36.740597788 +0000 -+++ slim.1 2014-03-10 21:22:07.373025770 +0000 -@@ -42,6 +42,9 @@ +--- slim.1.orig 2013-10-01 22:38:05 UTC ++++ slim.1 +@@ -37,13 +37,16 @@ display version information + run \fBslim\fP in daemon mode + .TP + .B +-\fBslim\fP \fB-p\fP /usr/share/\fBslim\fP/themes/default ++\fBslim\fP \fB-p\fP %%PREFIX%%/share/\fBslim\fP/themes/default + preview of the default theme .SH STARTING SLIM AT BOOT Please refer to documentation of your Operating System to make \fBslim\fP automatically startup after the system boots. @@ -10,5 +14,8 @@ $FreeBSD$ +For \fBFreeBSD\fP, you should add the line slim_enable=yes to /etc/rc.conf +to make \fBslim\fP start on boot. .SH CONFIGURATION - Global configuration is stored in the /etc/slim.conf file. See the comments +-Global configuration is stored in the /etc/slim.conf file. See the comments ++Global configuration is stored in the %%PREFIX%%/etc/slim.conf file. See the comments inside the file for a detailed explanation of the \fIoptions\fP. + .SH USAGE AND SPECIAL USERNAMES + When started, \fBslim\fP will show a login panel; enter the username and Modified: head/x11/slim/files/patch-slim.conf ============================================================================== --- head/x11/slim/files/patch-slim.conf Sun Nov 2 09:37:38 2014 (r372059) +++ head/x11/slim/files/patch-slim.conf Sun Nov 2 09:44:01 2014 (r372060) @@ -11,7 +11,7 @@ +default_xserver %%LOCALBASE%%/bin/X +# The X server needs to be started on an unused virtual terminal, +# for FreeBSD in a default configuration, the first one of those is #09 -+xserver_arguments vt09 ++xserver_arguments -nolisten tcp vt09 # Commands for halt, login, etc. -halt_cmd /sbin/shutdown -h now Modified: head/x11/slim/pkg-plist ============================================================================== --- head/x11/slim/pkg-plist Sun Nov 2 09:37:38 2014 (r372059) +++ head/x11/slim/pkg-plist Sun Nov 2 09:44:01 2014 (r372060) @@ -5,12 +5,7 @@ lib/libslim.so.%%VERSION%% %%DATADIR%%/themes/default/panel.png %%DATADIR%%/themes/default/slim.theme man/man1/slim.1.gz -@dirrmtry %%DATADIR%%/themes/default -@dirrmtry %%DATADIR%%/themes -@dirrmtry %%DATADIR%% -@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf; then rm -f %D/etc/slim.conf; fi -etc/slim.conf.sample -@exec if [ ! -f %D/etc/slim.conf ]; then cp -p %D/%F %B/slim.conf; fi +@sample etc/slim.conf.sample %%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim; then rm -f %D/etc/pam.d/slim; fi %%PAM%%etc/pam.d/slim.default %%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ]; then cp -p %D/%F %B/slim; fi