From tijl@coosemans.org  Thu Jul  4 16:08:40 2013
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 0053B915
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2013 16:08:39 +0000 (UTC)
	(envelope-from tijl@coosemans.org)
Received: from mailrelay006.isp.belgacom.be (mailrelay006.isp.belgacom.be [195.238.6.172])
	by mx1.freebsd.org (Postfix) with ESMTP id 973D51EF1
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2013 16:08:39 +0000 (UTC)
Received: from 139.159-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.159.139])
  by relay.skynet.be with ESMTP; 04 Jul 2013 18:08:37 +0200
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id r64G8VeH007489
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 4 Jul 2013 18:08:36 +0200 (CEST)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id r64G8Vjs007488;
	Thu, 4 Jul 2013 18:08:31 +0200 (CEST)
	(envelope-from tijl)
Message-Id: <201307041608.r64G8Vjs007488@kalimero.tijl.coosemans.org>
Date: Thu, 4 Jul 2013 18:08:31 +0200 (CEST)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] sysutils/pftop: set CSTD=gnu89
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         180269
>Category:       ports
>Synopsis:       [patch] sysutils/pftop: set CSTD=gnu89
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    araujo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 04 16:10:02 UTC 2013
>Closed-Date:    Fri Jul 12 05:43:28 UTC 2013
>Last-Modified:  Fri Jul 12 05:50:00 UTC 2013
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
Problems with inline and clang are because clang defaults to C99.
Instead of patching the code just use C89.
>How-To-Repeat:
>Fix:

--- pftop.patch begins here ---
Index: sysutils/pftop/Makefile
===================================================================
--- sysutils/pftop/Makefile	(revision 322214)
+++ sysutils/pftop/Makefile	(working copy)
@@ -34,6 +34,7 @@ CFLAGS+=	-DHAVE_FINE_GRAINED_LOCKING=1
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-engine.c
 
+MAKE_ARGS+=	CSTD=gnu89
 MAKE_ENV+=	__MAKE_CONF=/dev/null
 
 PLIST_FILES=	sbin/pftop
@@ -43,7 +44,6 @@ post-patch:
 	    ${WRKSRC}/engine.c
 	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h
 	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c
-	@${REINPLACE_CMD} -e 's|__inline__|static __inline__|g' ${WRKSRC}/pftop.c
 	@${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \
 	    ${WRKSRC}/sf-gencode.c
 
--- pftop.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jul 4 16:10:18 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180269 
State-Changed-From-To: open->closed 
State-Changed-By: araujo 
State-Changed-When: Fri Jul 12 05:43:27 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180269: commit references a PR
Date: Fri, 12 Jul 2013 05:41:17 +0000 (UTC)

 Author: araujo
 Date: Fri Jul 12 05:41:05 2013
 New Revision: 322815
 URL: http://svnweb.freebsd.org/changeset/ports/322815
 
 Log:
   - Instead of patching the code just use C89 and stop the problems with inline.
   
   PR:		ports/180269
   Submitted by:	tijl@
 
 Modified:
   head/sysutils/pftop/Makefile
 
 Modified: head/sysutils/pftop/Makefile
 ==============================================================================
 --- head/sysutils/pftop/Makefile	Fri Jul 12 05:12:42 2013	(r322814)
 +++ head/sysutils/pftop/Makefile	Fri Jul 12 05:41:05 2013	(r322815)
 @@ -34,6 +34,7 @@ CFLAGS+=	-DHAVE_FINE_GRAINED_LOCKING=1
  
  EXTRA_PATCHES+=	${FILESDIR}/extra-patch-engine.c
  
 +MAKE_ARGS+=	CSTD=gnu89
  MAKE_ENV+=	__MAKE_CONF=/dev/null
  
  PLIST_FILES=	sbin/pftop
 @@ -43,7 +44,6 @@ post-patch:
  	    ${WRKSRC}/engine.c
  	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h
  	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c
 -	@${REINPLACE_CMD} -e 's|__inline__|static __inline__|g' ${WRKSRC}/pftop.c
  	@${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \
  	    ${WRKSRC}/sf-gencode.c
  
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
