ports/163635: [PATCH] net/opal3: Fix build on 10-CURRENT

[Steve Wills]

>Number:         163635
>Category:       ports
>Synopsis:       [PATCH] net/opal3: Fix build on 10-CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 26 22:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Steve Wills
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #8: Mon Dec 19 15:53:28 EST 2011
>Description:
The attached patch fixes the issue with building net/opal3 on 10-CURRENT. It's
basically just a more correct version of the existing patch. This is marked
serious since it blocks building x11/gnome2 on 10-CURRENT. Also pet portlint
while here. Not PORTREVISION bump since the build output remains the same.

Added file(s):
- files/patch-spandsp_fax.cpp
- files/patch-spandsp_if.cpp

Removed file(s):
- files/patch-spandsp_if.h

Port maintainer (melifaro at ipfw.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- opal3-3.6.6_13.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/opal3/Makefile,v
retrieving revision 1.109
diff -u -u -r1.109 Makefile
--- Makefile	21 Dec 2011 08:48:28 -0000	1.109
+++ Makefile	26 Dec 2011 21:50:49 -0000
@@ -11,11 +11,12 @@
 CATEGORIES=	net
 MASTER_SITES=	SF/opalvoip/v3.6%20Lalande/Stable%205
 DISTNAME=	opal-${PORTVERSION}
-LICENSE=	MPL
 
 MAINTAINER=	melifaro at ipfw.ru
 COMMENT=	VoIP abstraction library
 
+LICENSE=	MPL
+
 LIB_DEPENDS=	pt-2.6.[4-9]:${PORTSDIR}/devel/ptlib26
 
 CONFLICTS=	opal-2.*
Index: files/patch-spandsp_fax.cpp
===================================================================
RCS file: files/patch-spandsp_fax.cpp
diff -N files/patch-spandsp_fax.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-spandsp_fax.cpp	26 Dec 2011 21:50:49 -0000
@@ -0,0 +1,10 @@
+--- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig	2011-12-26 21:02:09.000000000 +0000
++++ plugins/fax/fax_spandsp/spandsp_fax.cpp	2011-12-26 21:01:38.000000000 +0000
+@@ -42,6 +42,7 @@
+  *
+  */
+ 
++#define __STDC_LIMIT_MACROS
+ #include <codec/opalplugin.h>
+ 
+ extern "C" {
Index: files/patch-spandsp_if.cpp
===================================================================
RCS file: files/patch-spandsp_if.cpp
diff -N files/patch-spandsp_if.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-spandsp_if.cpp	26 Dec 2011 21:50:49 -0000
@@ -0,0 +1,10 @@
+--- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp.orig	2011-12-26 21:04:48.000000000 +0000
++++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.cpp	2011-12-26 21:05:21.000000000 +0000
+@@ -23,6 +23,7 @@
+  * $Id: spandsp_if.cpp,v 1.7 2007/07/24 04:39:44 csoutheren Exp $
+  */
+ 
++#define __STDC_LIMIT_MACROS
+ #include "spandsp_if.h"
+ 
+ #include <iostream>
Index: files/patch-spandsp_if.h
===================================================================
RCS file: files/patch-spandsp_if.h
diff -N files/patch-spandsp_if.h
--- files/patch-spandsp_if.h	27 Sep 2009 15:52:55 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h.orig	2009-08-30 02:52:53.000000000 +0400
-+++ plugins/fax/fax_spandsp/spandsp_util/spandsp_if.h	2009-08-30 02:53:00.000000000 +0400
-@@ -24,6 +24,11 @@
-  */
- 
- extern "C" {
-+#undef __cplusplus
-+#undef _MACHINE__STDINT_H_
-+#include <machine/_stdint.h>
-+#define __cplusplus
-+
- #include "spandsp.h"
- };
- 
--- opal3-3.6.6_13.patch ends here ---

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