From jbeich@tormail.net  Mon Nov 28 05:44:14 2011
Return-Path: <jbeich@tormail.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 158BB106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Nov 2011 05:44:14 +0000 (UTC)
	(envelope-from jbeich@tormail.net)
Received: from server2.hudsonvalleyhost.com (server2.hudsonvalleyhost.com [66.7.195.77])
	by mx1.freebsd.org (Postfix) with ESMTP id DA27D8FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Nov 2011 05:44:13 +0000 (UTC)
Received: from [31.31.36.246] (port=59965 helo=internal.tormail.net)
	by server2.hudsonvalleyhost.com with esmtpsa (TLSv1:RC4-SHA:128)
	(Exim 4.69)
	(envelope-from <jbeich@tormail.net>)
	id 1RUu0h-0016jM-VQ
	for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Nov 2011 00:44:12 -0500
Received: from jbeich by internal.tormail.net with local (Exim 4.63)
	(envelope-from <jbeich@tormail.net>)
	id 1RUu02-000NVF-Tz
	for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Nov 2011 05:43:33 +0000
Message-Id: <1RUu02-000NVF-Tz@internal.tormail.net>
Date: Sun, 27 Nov 2011 18:18:11 -1000
From: Jan Beich <jbeich@tormail.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] x11-fm/xfe: unbreak build with clang

>Number:         162914
>Category:       ports
>Synopsis:       [patch] x11-fm/xfe: unbreak build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 28 05:50:09 UTC 2011
>Closed-Date:    Mon Nov 28 12:53:00 UTC 2011
>Last-Modified:  Mon Nov 28 13:00:23 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 28 05:50:29 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162914 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Mon Nov 28 12:52:58 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162914 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/162914: commit references a PR
Date: Mon, 28 Nov 2011 12:53:13 +0000 (UTC)

 gahr        2011-11-28 12:52:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-fm/xfe           Makefile 
     x11-fm/xfe/files     patch-xvt_ttyinit.c 
   Log:
   - Fix build with clang
   
   PR:             162914
   Submitted by:   Jan Beich <jbeich@tormail.net>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.48      +2 -0      ports/x11-fm/xfe/Makefile
   1.2       +13 -3     ports/x11-fm/xfe/files/patch-xvt_ttyinit.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
