x11/kde-workspace4: fix build on fbsd

* genkdmconf: FreeBSD 10+ does not have utmp, only utmpx. Use utmpx
when available.
* not only Linux, but also FreeBSD can have libutempter present. Make
sure PLIST is correct in both cases.

Ok@ markd

3 files changed, 23 insertions, 8 deletions

diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index 0c0fee43362..81dc18c609b 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/11/30 03:27:46 markd Exp $
+# $NetBSD: Makefile,v 1.44 2015/01/15 17:59:10 rumko Exp $
 
 DISTNAME=	kde-workspace-4.11.14
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -66,6 +66,8 @@ PLIST_SUBST+=		KDE_VERSION=${_KDE_VERSION}
 PLIST_VARS+=	utempter noutempter
 .if ${OPSYS} == "Linux" && exists(/usr/include/utempter.h)
 PLIST.utempter=		yes
+.elif ${OPSYS} == "FreeBSD" && exists(/usr/include/utempter.h)
+PLIST.utempter=		yes
 .else
 PLIST.noutempter=	yes
 .endif
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index a2f867e0d12..8b8237486ae 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2014/11/13 10:53:49 markd Exp $
+$NetBSD: distinfo,v 1.13 2015/01/15 17:59:10 rumko Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -16,7 +16,7 @@ SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead0
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
 SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
-SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 12986752a1062199833df5aeba8163277ddb7361
+SHA1 (patch-kdm_kfrontend_genkdmconf.c) = d586b2e40b46a350140613d934f809444ce43165
 SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db
 SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
 SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c
diff --git a/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c b/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
index fe23be1036e..c51c348743f 100644
--- a/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
+++ b/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
@@ -1,14 +1,27 @@
-$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.1 2012/04/15 05:55:00 markd Exp $
+$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.2 2015/01/15 17:59:10 rumko Exp $
 
---- kdm/kfrontend/genkdmconf.c.orig	2012-03-29 22:02:31.000000000 +0000
+On some systems (e.g. fbsd 10+) utmp is no longer available, use utmpx instead.
+
+--- kdm/kfrontend/genkdmconf.c.orig	2014-11-06 22:36:58.000000000 +0000
 +++ kdm/kfrontend/genkdmconf.c
-@@ -46,9 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -46,12 +46,18 @@ Foundation, Inc., 51 Franklin Street, Fi
  #include <sys/wait.h>
  #include <sys/param.h>
  #ifdef BSD
 -# ifdef BSD_UTMP
++# ifdef HAVE_UTMPX
++#  include <utmpx.h>
++# else
  #  include <utmp.h>
--# endif
+ # endif
  # ifndef _PATH_UTMP
  #  if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
- #   define _PATH_UTMP "/var/run/utmp"
+-#   define _PATH_UTMP "/var/run/utmp"
++#   if __FreeBSD_version >= 1001000
++#    define _PATH_UTMP "/var/run/utx.active"
++#   else
++#    define _PATH_UTMP "/var/run/utmp"
++#   endif
+ #  else
+ #   error "_PATH_UTMP must be defined"
+ #  endif