ports/162914: [patch] x11-fm/xfe: unbreak build with clang

[Jan Beich]

>Number:         162914
>Category:       ports
>Synopsis:       [patch] x11-fm/xfe: unbreak build with clang
>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:   Mon Nov 28 05:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
utmp/utmpx seems to be unused by the port
>How-To-Repeat:
http://pointyhat-west.isc.freebsd.org/errorlogs/amd64-errorlogs/e.9-exp-clang.20111126065358.pointyhat-west/xfe-1.32.4.log
>Fix:
--- clang.diff begins here ---
Index: x11-fm/xfe/Makefile
===================================================================
RCS file: /a/.csup/ports/x11-fm/xfe/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- x11-fm/xfe/Makefile	23 Sep 2011 22:26:20 -0000	1.47
+++ x11-fm/xfe/Makefile	28 Nov 2011 03:04:13 -0000
@@ -30,5 +30,7 @@ post-patch:
 		${WRKSRC}/src/XFileExplorer.cpp \
 		${WRKSRC}/src/help.h \
 		${WRKSRC}/src/xfedefs.h
+	@${REINPLACE_CMD} 's/unsigned FXchar/FXuchar/' \
+		${WRKSRC}/src/xfeutils.cpp
 
 .include <bsd.port.mk>
Index: x11-fm/xfe/files/patch-xvt_ttyinit.c
===================================================================
RCS file: /a/.csup/ports/x11-fm/xfe/files/patch-xvt_ttyinit.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-xvt_ttyinit.c
--- x11-fm/xfe/files/patch-xvt_ttyinit.c	24 Aug 2010 09:12:56 -0000	1.1
+++ x11-fm/xfe/files/patch-xvt_ttyinit.c	28 Nov 2011 03:10:17 -0000
@@ -14,6 +14,16 @@
  #include <grp.h>
  #include <pwd.h>
  #include <errno.h>
+@@ -175,7 +180,9 @@
+ #ifdef BSD_UTMP
+ static int tslot = -1;		/* index to our slot in the utmp file */
+ #endif /* BSD_UTMP */
++#if defined(BSD_UTMP) || defined(SVR4_UTMP)
+ static struct utmp utent;	/* our current utmp entry */
++#endif
+ 
+ /*  Catch a SIGCHLD signal and exit if the direct child has died.
+  */
 @@ -398,7 +403,7 @@
   */
  static char* get_pseudo_tty(int* pmaster, int* pslave)
--- clang.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: