svn commit: r307866 - in head/x11/slim: . files

[Guido Falsi]

Author: madpilot
Date: Tue Nov 27 23:11:32 2012
New Revision: 307866
URL: http://svnweb.freebsd.org/changeset/ports/307866

Log:
  - Fix stopping via rc script
  - Fix build with clang [1]
  - Trim Makefile headers
  - Bump PORTREVISION
  
  PR:		ports/173852
  Submitted by:	Douglas Carmichael <dcarmich at dcarmichael.net>
  Approved by:	Henry Hu <henry.hu.sh at gmail.com> (maintainer)
  Obtained by:	slim svn repository [1]
  Feature safe:	yes

Added:
  head/x11/slim/files/patch-log.h   (contents, props changed)
Modified:
  head/x11/slim/Makefile   (contents, props changed)
  head/x11/slim/files/slim.in   (contents, props changed)

Modified: head/x11/slim/Makefile
==============================================================================
--- head/x11/slim/Makefile	Tue Nov 27 22:34:39 2012	(r307865)
+++ head/x11/slim/Makefile	Tue Nov 27 23:11:32 2012	(r307866)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	slim
-# Date created:				8 Jan 2006
-# Whom:					Tobias Roth <ports at fsck.ch>
-#
+# Created by: Tobias Roth <ports at 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
 
 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

Added: head/x11/slim/files/patch-log.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/slim/files/patch-log.h	Tue Nov 27 23:11:32 2012	(r307866)
@@ -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>
+ 

Modified: head/x11/slim/files/slim.in
==============================================================================
--- head/x11/slim/files/slim.in	Tue Nov 27 22:34:39 2012	(r307865)
+++ head/x11/slim/files/slim.in	Tue Nov 27 23:11:32 2012	(r307866)
@@ -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"