ports/142855: [ports/emulators/virtualbox-ose] need to change "<utmp.h>" to "<utmpx.h>" for -current

[YAMAMOTO at FreeBSD.org]

>Number:         142855
>Category:       ports
>Synopsis:       [ports/emulators/virtualbox-ose] need to change "<utmp.h>" to "<utmpx.h>" for -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 15 10:20:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     YAMAMOTO, Shigeru
>Release:        FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD halley.os-hackers.jp 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Thu Jan  7 18:12:49 JST 2010     root:XXXX i386

>Description:
in -current, after 2010-01-13, "utmp.h" is move to "utmpx.h".
So, need to change codes which include "utmp.h".

>How-To-Repeat:
1) update -current system to '2010-01-13' or later (make buildworld && make installworld)
2) cd @ports/emulators/virtualbox-ose/
3) make

>Fix:
add a patch to 'files' directory.


Patch attached with submission follows:

--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig    2009-12-17 23:25:29.000000000 +0900
+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp 2010-01-15 16:57:00.000000000 +0900
@@ -38,7 +38,16 @@
 # include <sys/socket.h>
 # include <net/if.h>
 # include <unistd.h>
+#if defined(RT_OS_FREEBSD)
+# include <sys/param.h>
+# if __FreeBSD_version >= 900007
+#  include <utmpx.h>
+# else
+#  include <utmp.h>
+# endif
+#else
 # include <utmp.h>
+#endif
 # ifdef RT_OS_SOLARIS
 #  include <sys/sockio.h>
 # endif


>Release-Note:
>Audit-Trail:
>Unformatted: