mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 16:40:31 -04:00
f334fbf75a
- Rewrite dependencies - Pass maintainership to submitter PR: ports/166733 Submitted by: Jason Bacon <jwbacon@tds.net> Approved by: Andy Pavlo <pavlo@cs.brown.edu> (former maintainer)
27 lines
1,006 B
C++
27 lines
1,006 B
C++
--- src/condor_sysapi/idle_time.cpp.orig 2012-01-17 10:53:14.000000000 -0600
|
|
+++ src/condor_sysapi/idle_time.cpp 2012-04-07 14:37:17.000000000 -0500
|
|
@@ -202,17 +202,22 @@
|
|
return;
|
|
}
|
|
|
|
+// FreeBSD 9 made a clean break from utmp to utmpx
|
|
+#if !defined(CONDOR_FREEBSD9)
|
|
#include <utmp.h>
|
|
#define UTMP_KIND utmp
|
|
+#endif
|
|
|
|
#if defined(LINUX)
|
|
static char *UtmpName = "/var/run/utmp";
|
|
static char *AltUtmpName = "/var/adm/utmp";
|
|
-#elif defined(CONDOR_FREEBSD)
|
|
+// FreeBSD 9 made a clean break from utmp to utmpx
|
|
+#elif defined(CONDOR_FREEBSD) && !defined(CONDOR_FREEBSD9)
|
|
static char *UtmpName = "/var/run/utmp";
|
|
static char *AltUtmpName = "";
|
|
-#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11)
|
|
+#elif defined(Solaris28) || defined(Solaris29) || defined(Solaris10) || defined(Solaris11) || defined(CONDOR_FREEBSD9)
|
|
#include <utmpx.h>
|
|
+#define ut_name ut_user
|
|
static char *UtmpName = "/etc/utmpx";
|
|
static char *AltUtmpName = "/var/adm/utmpx";
|
|
#undef UTMP_KIND
|