Index: head/x11/slim/Makefile
===================================================================
--- head/x11/slim/Makefile	(revision 257220)
+++ head/x11/slim/Makefile	(revision 257221)
@@ -1,55 +1,55 @@
 # New ports collection makefile for:	slim
 # Date created:				8 Jan 2006
 # Whom:					Tobias Roth <ports@fsck.ch>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	slim
 PORTVERSION=	1.3.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_BERLIOS} \
 		http://depot.fsck.ch/mirror/distfiles/
 MASTER_SITE_SUBDIR=slim
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Graphical login manager for X11, derived from Login.app
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_XORG=	x11 xft xmu xorg-server xrender
 USE_RC_SUBR=	slim.sh
 SUB_FILES=	pkg-message
 
 MAN1=		slim.1
 
 MAKEFILE=	Makefile.freebsd
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${WRKSRC}/${PORTNAME}.conf
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
 	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
 	@${MKDIR} ${DATADIR}/themes/default
 	@${INSTALL_DATA} ${WRKSRC}/themes/default/${PORTNAME}.theme ${DATADIR}/themes/default
 	@${INSTALL_DATA} ${WRKSRC}/themes/default/panel.png ${DATADIR}/themes/default
 	@${INSTALL_DATA} ${WRKSRC}/themes/default/background.jpg ${DATADIR}/themes/default
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/slim.conf ]; then \
 		${INSTALL_DATA} -p ${WRKSRC}/slim.conf ${PREFIX}/etc/slim.conf ; \
 	fi
 	@${ECHO_MSG} ""
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
 .include <bsd.port.post.mk>

Property changes on: head/x11/slim/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/x11/slim/files/patch-002-fix-shutdown
===================================================================
--- head/x11/slim/files/patch-002-fix-shutdown	(nonexistent)
+++ head/x11/slim/files/patch-002-fix-shutdown	(revision 257221)
@@ -0,0 +1,65 @@
+------------------------------------------------------------------------
+r169 | iwamatsu | 2009-11-14 09:13:57 +0100 (Sat, 14 Nov 2009) | 11 lines
+
+Add flag of server check
+
+Slim gets this SIGTERM, and its signal handler calls
+CloseServer() to teardown X. But X is not yet started (as StartServer()
+is still running in another thread, waiting in pause()), and hence this
+calls XcloseDisplay which frees some resources which are not yet allocated.
+
+This parch fix this problem.
+Thanks, Landry Breuil, goebbels, jasper and OpenBSD Developer.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+------------------------------------------------------------------------
+--- app.h	(revision 168)
++++ app.h	(revision 169)
+@@ -36,6 +36,7 @@
+     int GetServerPID();
+     void StopServer();
+ 
++	bool serverStarted;
+     // Lock functions
+     void GetLock();
+     void RemoveLock();
+--- app.cpp	(revision 168)
++++ app.cpp	(revision 169)
+@@ -105,7 +105,10 @@
+ 
+ void CatchSignal(int sig) {
+     cerr << APPNAME << ": unexpected signal " << sig << endl;
+-    LoginApp->StopServer();
++
++    if (LoginApp->serverStarted)
++        LoginApp->StopServer();
++
+     LoginApp->RemoveLock();
+     exit(ERR_EXIT);
+ }
+@@ -140,6 +143,7 @@
+     int tmp;
+     ServerPID = -1;
+     testing = false;
++    serverStarted = false;
+     mcookie = string(App::mcookiesize, 'a');
+     daemonmode = false;
+     force_nodaemon = false;
+@@ -860,6 +864,8 @@
+     char* args = new char[argOption.length()+2]; // NULL plus vt
+     strcpy(args, argOption.c_str());
+ 
++    serverStarted = false;
++
+     int argc = 1;
+     int pos = 0;
+     bool hasVtSet = false;
+@@ -940,6 +946,8 @@
+     
+     delete args;
+ 
++    serverStarted = true;
++
+     return ServerPID;
+ }
+ 

Property changes on: head/x11/slim/files/patch-002-fix-shutdown
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property