Index: head/x11/slim/Makefile =================================================================== --- head/x11/slim/Makefile (revision 372059) +++ head/x11/slim/Makefile (revision 372060) @@ -1,68 +1,69 @@ # Created by: Tobias Roth # $FreeBSD$ PORTNAME= slim PORTVERSION= 1.3.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios MAINTAINER= henry.hu.sh@gmail.com COMMENT= Graphical login manager for X11, derived from Login.app LICENSE= GPLv2 LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng15.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libck-connector.so:${PORTSDIR}/sysutils/consolekit \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig 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 \ -DBUILD_SLIMLOCK=no \ -DBUILD_SHARED_LIBS=yes OPTIONS_DEFINE= PAM UTF8 OPTIONS_DEFAULT= PAM UTF8_DESC= Support UTF-8 characters PLIST_SUB+= VERSION="${PORTVERSION}" .include .if ${PORT_OPTIONS:MPAM} CMAKE_ARGS+= -DUSE_PAM=yes PLIST_SUB+= PAM="" .else CMAKE_ARGS+= -DUSE_PAM=no PLIST_SUB+= PAM="@comment " .endif .if ${PORT_OPTIONS:MUTF8} # patch taken from slim-unicode in Arch User Repository EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-utf8 .endif 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: . if ${PORT_OPTIONS:MPAM} ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/slim.default . endif .include Index: head/x11/slim/files/patch-slim.1 =================================================================== --- head/x11/slim/files/patch-slim.1 (revision 372059) +++ head/x11/slim/files/patch-slim.1 (revision 372060) @@ -1,14 +1,21 @@ -$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. +.PP +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 Property changes on: head/x11/slim/files/patch-slim.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/x11/slim/files/patch-slim.conf =================================================================== --- head/x11/slim/files/patch-slim.conf (revision 372059) +++ head/x11/slim/files/patch-slim.conf (revision 372060) @@ -1,81 +1,81 @@ --- slim.conf.orig 2013-10-01 18:38:05.000000000 -0400 +++ slim.conf 2014-08-28 21:35:07.000000000 -0400 @@ -1,17 +1,20 @@ # Path, X server and arguments (if needed) # Note: -xauth $authfile is automatically appended -default_path /bin:/usr/bin:/usr/local/bin -default_xserver /usr/bin/X -#xserver_arguments -dpi 75 +# Use default path from /etc/login.conf +default_path /sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:$HOME/bin +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 +halt_cmd /sbin/shutdown -p now reboot_cmd /sbin/shutdown -r now -console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" -#suspend_cmd /usr/sbin/suspend +console_cmd %%LOCALBASE%%/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login" +suspend_cmd /usr/sbin/acpiconf -s 3 # Full path to the xauth binary -xauth_path /usr/bin/xauth +xauth_path %%LOCALBASE%%/bin/xauth # Xauth file for server authfile /var/run/slim.auth @@ -32,8 +35,8 @@ # NOTE: if your system does not have bash you need # to adjust the command according to your preferred shell, # i.e. for freebsd use: -# login_cmd exec /bin/sh - ~/.xinitrc %session -login_cmd exec /bin/bash -login ~/.xinitrc %session +login_cmd exec /bin/sh - ~/.xinitrc %session +#login_cmd exec /bin/bash -login ~/.xinitrc %session # Commands executed when starting and exiting a session. # They can be used for registering a X11 session with @@ -47,11 +50,16 @@ # options "-d" and "-nodaemon" # daemon yes -# Available sessions (first one is the default). -# The current chosen session name is replaced in the login_cmd -# above, so your login command can handle different sessions. -# see the xinitrc.sample file shipped with slim sources -sessions xfce4,icewm-session,wmaker,blackbox +# Option "sessions" is no longer supported. +# Now you need to put session files in the directory specified +# by option "sessiondir". +# sessions xfce4,icewm-session,wmaker,blackbox + +# Directory of session files. +# They should be xdg-style .desktop files. +# The "Name" entry in the session file would be used as session name. +# The "Exec" entry would replace %session in login_cmd. +sessiondir %%LOCALBASE%%/share/xsessions # Executed when pressing F11 (requires imagemagick) screenshot_cmd import -window root /slim.png @@ -63,7 +71,7 @@ # session_msg Session: # shutdown / reboot messages -shutdown_msg The system is halting... +shutdown_msg The system is powering down... reboot_msg The system is rebooting... # default user, leave blank or remove this line @@ -84,7 +92,7 @@ current_theme default # Lock file -lockfile /var/run/slim.lock +lockfile /var/run/slim.pid # Log file logfile /var/log/slim.log Index: head/x11/slim/pkg-plist =================================================================== --- head/x11/slim/pkg-plist (revision 372059) +++ head/x11/slim/pkg-plist (revision 372060) @@ -1,16 +1,11 @@ bin/slim lib/libslim.so lib/libslim.so.%%VERSION%% %%DATADIR%%/themes/default/background.jpg %%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