diff options
| author | madpilot <madpilot@FreeBSD.org> | 2012-11-28 07:11:32 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2012-11-28 07:11:32 +0800 |
| commit | 967d330db837359ace7b11989185253963a534fb (patch) | |
| tree | 4de92558e3dcc319ffff7d62625227573a713240 /x11 | |
| parent | f0c6a6cf38d3d35872cdc0349ac639448eb8309f (diff) | |
| download | freebsd-ports-gnome-967d330db837359ace7b11989185253963a534fb.tar.gz freebsd-ports-gnome-967d330db837359ace7b11989185253963a534fb.tar.zst freebsd-ports-gnome-967d330db837359ace7b11989185253963a534fb.zip | |
- Fix stopping via rc script
- Fix build with clang [1]
- Trim Makefile headers
- Bump PORTREVISION
PR: ports/173852
Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net>
Approved by: Henry Hu <henry.hu.sh@gmail.com> (maintainer)
Obtained by: slim svn repository [1]
Feature safe: yes
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/slim/Makefile | 11 | ||||
| -rw-r--r-- | x11/slim/files/patch-log.h | 15 | ||||
| -rw-r--r-- | x11/slim/files/slim.in | 5 |
3 files changed, 21 insertions, 10 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile index ea4a4db69d06..b1b7a7ff93e3 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: slim -# Date created: 8 Jan 2006 -# Whom: Tobias Roth <ports@fsck.ch> -# +# Created by: Tobias Roth <ports@fsck.ch> # $FreeBSD$ PORTNAME= slim PORTVERSION= 1.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://slim.berlios.de/releases/ @@ -15,8 +12,8 @@ COMMENT= Graphical login manager for X11, derived from Login.app LICENSE= GPLv2 -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit \ +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + ck-connector:${PORTSDIR}/sysutils/consolekit \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig diff --git a/x11/slim/files/patch-log.h b/x11/slim/files/patch-log.h new file mode 100644 index 000000000000..054e8051dab4 --- /dev/null +++ b/x11/slim/files/patch-log.h @@ -0,0 +1,15 @@ +--- log.h.orig 2012-06-26 10:20:14.000000000 +0200 ++++ log.h 2012-11-25 20:00:39.294546666 +0100 +@@ -1,6 +1,12 @@ + #ifndef _LOG_H_ + #define _LOG_H_ + ++#ifdef USE_CONSOLEKIT ++#include "Ck.h" ++#endif ++#ifdef USE_CONSOLEKIT ++#include "PAM.h" ++#endif + #include "const.h" + #include <fstream> + diff --git a/x11/slim/files/slim.in b/x11/slim/files/slim.in index 6d9f378396d1..d54bd26d2c31 100644 --- a/x11/slim/files/slim.in +++ b/x11/slim/files/slim.in @@ -61,9 +61,8 @@ slim_prestop () find_pidfile - xpid=`ps -axww | grep '/bin/[X] .* -auth /var/run/slim.auth'` - xpid="${xpid## }" - [ -n "$xpid" ] && kill ${xpid%% *} + xpid=`ps -axww | grep '/bin/[X] .* -auth /var/run/slim.auth' | grep -v grep | awk '{print $1};'` + [ -n "$xpid" ] && kill $xpid } run_rc_command "$1" |