3 files changed, 22 insertions, 23 deletions

diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 4fa1497a32e1..75a64bc3d9bb 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,11 +3,10 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $
+#    $MCom: ports/sysutils/consolekit/Makefile,v 1.25 2010/10/23 10:12:30 kwm Exp $
 
 PORTNAME=	consolekit
-PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.freedesktop.org/software/ConsoleKit/dist/
 DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 0dbdd04a2b42..54e666b605cc 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
-SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
-SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
+MD5 (ConsoleKit-0.4.2.tar.bz2) = 285acb35bfcb2b8dc21c6071e6f6e116
+SHA256 (ConsoleKit-0.4.2.tar.bz2) = 656f406c9c436bd105c34d87e824cb2fbae09fa672b93894059281124480fe15
+SIZE (ConsoleKit-0.4.2.tar.bz2) = 412651
diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in
index b818fd9319d0..ed58bbb7ad6d 100644
--- a/sysutils/consolekit/files/patch-tools_Makefile.in
+++ b/sysutils/consolekit/files/patch-tools_Makefile.in
@@ -1,8 +1,8 @@
---- tools/Makefile.in.orig	2008-01-31 16:09:08.000000000 -0500
-+++ tools/Makefile.in	2008-01-31 16:10:21.000000000 -0500
-@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT)
+--- tools/Makefile.in.orig	2010-10-23 11:29:43.000000000 +0200
++++ tools/Makefile.in	2010-10-23 11:32:41.000000000 +0200
+@@ -43,8 +43,7 @@ sbin_PROGRAMS = ck-log-system-start$(EXE
+ 	ck-log-system-restart$(EXEEXT) ck-log-system-stop$(EXEEXT) \
  	$(am__EXEEXT_1)
- sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1)
  libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
 -	ck-get-x11-server-pid$(EXEEXT) \
 -	ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
@@ -10,10 +10,10 @@
  subdir = tools
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS =  \
- am__DEPENDENCIES_1 =
- ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
+@@ -71,17 +70,6 @@ ck_collect_session_info_DEPENDENCIES = $
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
 -am_ck_get_x11_display_device_OBJECTS =  \
 -	ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
 -ck_get_x11_display_device_OBJECTS =  \
@@ -28,7 +28,7 @@
  am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1)
  ck_history_OBJECTS = $(am_ck_history_OBJECTS)
  ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \
+@@ -441,24 +429,6 @@ ck_collect_session_info_LDADD = \
  	$(top_builddir)/src/libck.la	\
  	$(NULL)
  
@@ -53,25 +53,25 @@
  EXTRA_DIST = \
  	$(NULL)
  
-@@ -480,12 +450,6 @@ clean-sbinPROGRAMS:
+@@ -632,12 +602,6 @@ clean-sbinPROGRAMS:
  ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) 
  	@rm -f ck-collect-session-info$(EXEEXT)
- 	$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
+ 	$(AM_V_CCLD)$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
 -ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) 
 -	@rm -f ck-get-x11-display-device$(EXEEXT)
--	$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
+-	$(AM_V_CCLD)$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
 -ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) 
 -	@rm -f ck-get-x11-server-pid$(EXEEXT)
--	$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
+-	$(AM_V_CCLD)$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
  ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) 
  	@rm -f ck-history$(EXEEXT)
- 	$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-@@ -503,8 +467,6 @@ distclean-compile:
+ 	$(AM_V_CCLD)$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
+@@ -664,8 +628,6 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-launch-session.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-restart.Po@am__quote@