Sun Jan 25 13:15:34 2015 UTC ()
utmpx change for FreeBSD broke NetBSD, so try to do the right thing and
always use it.


(joerg)
diff -r1.13 -r1.14 pkgsrc/x11/kde-workspace4/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c
cvs diff -r1.13 -r1.14 pkgsrc/x11/kde-workspace4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/distinfo 2015/01/15 17:59:10 1.13
+++ pkgsrc/x11/kde-workspace4/distinfo 2015/01/25 13:15:34 1.14
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: distinfo,v 1.13 2015/01/15 17:59:10 rumko Exp $ 1$NetBSD: distinfo,v 1.14 2015/01/25 13:15:34 joerg Exp $
2 2
3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b 3SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 4RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
5Size (Daemon.README) = 2191 bytes 5Size (Daemon.README) = 2191 bytes
6SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d 6SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
7RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7 7RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
8Size (Daemon.png) = 15725 bytes 8Size (Daemon.png) = 15725 bytes
9SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c 9SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
10RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 10RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
11Size (NetBSD-flag-1.0.png) = 4532 bytes 11Size (NetBSD-flag-1.0.png) = 4532 bytes
12SHA1 (kde-workspace-4.11.14.tar.xz) = ec79a5d638a93b1abbb99b22a7bea52d9a2c26eb 12SHA1 (kde-workspace-4.11.14.tar.xz) = ec79a5d638a93b1abbb99b22a7bea52d9a2c26eb
13RMD160 (kde-workspace-4.11.14.tar.xz) = e17eebd9aefce2fa409ccc5d78b04009e69fcba3 13RMD160 (kde-workspace-4.11.14.tar.xz) = e17eebd9aefce2fa409ccc5d78b04009e69fcba3
14Size (kde-workspace-4.11.14.tar.xz) = 13529808 bytes 14Size (kde-workspace-4.11.14.tar.xz) = 13529808 bytes
15SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71 15SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
16SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 16SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
17SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7 17SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
18SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe 18SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
19SHA1 (patch-kdm_kfrontend_genkdmconf.c) = d586b2e40b46a350140613d934f809444ce43165 19SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
20SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db 20SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db
21SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21 21SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
22SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c 22SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c
23SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb 23SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb
24SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30 24SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30
25SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619 25SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619
26SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d 26SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.h) = e682d488c61ca2540ed4b2112c9bffc45bbe5e8d
27SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13 27SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.c) = 38f18a03c1b99fddbbc51fe52fd6e3b66e5d9f13
28SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983 28SHA1 (patch-ksysguard_ksysguardd_NetBSD_Memory.h) = e58dc4a0a7be7350251f26de34a8949e7508c983
29SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5 29SHA1 (patch-ksysguard_ksysguardd_NetBSD_ProcessList.c) = 0921fe9569bd54f5e381ebead738b95e431bb1d5
30SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b 30SHA1 (patch-ksysguard_ksysguardd_Solaris_LoadAvg.c) = bc3c434d09485cdf03a357ab5621271adcc3627b
31SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = 4b6625f9bebf6bd2c6057d7045d9ce6af3103578 31SHA1 (patch-kwin_effects_mousemark_mousemark.cpp) = 4b6625f9bebf6bd2c6057d7045d9ce6af3103578
32SHA1 (patch-kwin_glxbackend.cpp) = a5e954a70e943a2d40d35f8a49b611b03d072af6 32SHA1 (patch-kwin_glxbackend.cpp) = a5e954a70e943a2d40d35f8a49b611b03d072af6
cvs diff -r1.2 -r1.3 pkgsrc/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c 2015/01/15 17:59:10 1.2
+++ pkgsrc/x11/kde-workspace4/patches/patch-kdm_kfrontend_genkdmconf.c 2015/01/25 13:15:34 1.3
@@ -1,27 +1,42 @@ @@ -1,27 +1,42 @@
1$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.2 2015/01/15 17:59:10 rumko Exp $ 1$NetBSD: patch-kdm_kfrontend_genkdmconf.c,v 1.3 2015/01/25 13:15:34 joerg Exp $
2 2
3On some systems (e.g. fbsd 10+) utmp is no longer available, use utmpx instead. 3Use utmpx on all BSDs.
4 4
5--- kdm/kfrontend/genkdmconf.c.orig 2014-11-06 22:36:58.000000000 +0000 5--- kdm/kfrontend/genkdmconf.c.orig 2014-11-06 22:36:58.000000000 +0000
6+++ kdm/kfrontend/genkdmconf.c 6+++ kdm/kfrontend/genkdmconf.c
7@@ -46,12 +46,18 @@ Foundation, Inc., 51 Franklin Street, Fi 7@@ -46,16 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fi
8 #include <sys/wait.h> 8 #include <sys/wait.h>
9 #include <sys/param.h> 9 #include <sys/param.h>
10 #ifdef BSD 10 #ifdef BSD
11-# ifdef BSD_UTMP 11-# ifdef BSD_UTMP
12+# ifdef HAVE_UTMPX 12-# include <utmp.h>
 13-# endif
 14-# ifndef _PATH_UTMP
 15-# if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
 16-# define _PATH_UTMP "/var/run/utmp"
 17-# else
 18-# error "_PATH_UTMP must be defined"
 19-# endif
 20-# endif
13+# include <utmpx.h> 21+# include <utmpx.h>
14+# else 22 #endif
15 # include <utmp.h> 23
 24 #define WANT_CONF_GEN
 25@@ -1875,7 +1866,7 @@ edit_startup(File *file)
 26 #else
 27 # ifdef BSD
 28 delstr(file, "\n"
 29-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
 30+"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMPX " $USER\n") |
16 # endif 31 # endif
17 # ifndef _PATH_UTMP 32 #endif /* _AIX */
18 # if defined(__FreeBSD_version) && __FreeBSD_version >= 900007 33 delstr(file, "\n"
19-# define _PATH_UTMP "/var/run/utmp" 34@@ -1924,7 +1915,7 @@ edit_reset(File *file)
20+# if __FreeBSD_version >= 1001000 35 #else
21+# define _PATH_UTMP "/var/run/utx.active" 36 # ifdef BSD
22+# else 37 delstr(file, "\n"
23+# define _PATH_UTMP "/var/run/utmp" 38-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") |
24+# endif 39+"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMPX " $USER\n") |
25 # else 40 # endif
26 # error "_PATH_UTMP must be defined" 41 #endif /* _AIX */
27 # endif 42 delstr(file, "\n"