summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-01-25 13:15:34 +0000
committerjoerg <joerg@pkgsrc.org>2015-01-25 13:15:34 +0000
commitcec90966a31eccfdd5a6f47489b45e87a8143148 (patch)
tree68ea77938cbd231cfb5af6dd0524d0495d8b3d6b /x11
parent0e865236bbd33471c0579df2c71e87b9e8149a03 (diff)
downloadpkgsrc-cec90966a31eccfdd5a6f47489b45e87a8143148.tar.gz
utmpx change for FreeBSD broke NetBSD, so try to do the right thing and
always use it.
Diffstat (limited to 'x11')
-rw-r--r--x11/kde-workspace4/distinfo4
-rw-r--r--x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c49
2 files changed, 34 insertions, 19 deletions
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index 8b8237486ae..e89ca09e148 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/01/15 17:59:10 rumko Exp $
+$NetBSD: distinfo,v 1.14 2015/01/25 13:15:34 joerg 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) = d586b2e40b46a350140613d934f809444ce43165
+SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
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 c51c348743f..17a81abad3d 100644
--- a/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
+++ b/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
@@ -1,27 +1,42 @@
-$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.2 2015/01/15 17:59:10 rumko Exp $
+$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.3 2015/01/25 13:15:34 joerg Exp $
-On some systems (e.g. fbsd 10+) utmp is no longer available, use utmpx instead.
+Use utmpx on all BSDs.
--- kdm/kfrontend/genkdmconf.c.orig 2014-11-06 22:36:58.000000000 +0000
+++ kdm/kfrontend/genkdmconf.c
-@@ -46,12 +46,18 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -46,16 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <sys/wait.h>
#include <sys/param.h>
#ifdef BSD
-# ifdef BSD_UTMP
-+# ifdef HAVE_UTMPX
+-# include <utmp.h>
+-# endif
+-# ifndef _PATH_UTMP
+-# if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
+-# define _PATH_UTMP "/var/run/utmp"
+-# else
+-# error "_PATH_UTMP must be defined"
+-# endif
+-# endif
+# include <utmpx.h>
-+# else
- # include <utmp.h>
+ #endif
+
+ #define WANT_CONF_GEN
+@@ -1875,7 +1866,7 @@ edit_startup(File *file)
+ #else
+ # ifdef BSD
+ delstr(file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMPX " $USER\n") |
# endif
- # ifndef _PATH_UTMP
- # if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
--# 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
+ #endif /* _AIX */
+ delstr(file, "\n"
+@@ -1924,7 +1915,7 @@ edit_reset(File *file)
+ #else
+ # ifdef BSD
+ delstr(file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMPX " $USER\n") |
+ # endif
+ #endif /* _AIX */
+ delstr(file, "\n"