Use C99 syntax with C99 compilers. Fix a memset call. Bump revision.

4 files changed, 33 insertions, 10 deletions

diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 3db6d176186..2015c7c9c93 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/03/03 00:13:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/25 11:49:10 joerg Exp $
 #
 
 DISTNAME=	ortp-0.16.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/linphone/ortp/sources/
 
diff --git a/net/ortp/distinfo b/net/ortp/distinfo
index 2e2b901a724..dd3fa6e2478 100644
--- a/net/ortp/distinfo
+++ b/net/ortp/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/03/11 09:38:12 wiz Exp $
+$NetBSD: distinfo,v 1.4 2012/06/25 11:49:10 joerg Exp $
 
 SHA1 (ortp-0.16.1.tar.gz) = 4e6288745b066d51b58834e2e33d8bc48d50d94e
 RMD160 (ortp-0.16.1.tar.gz) = c1c85ebdf308de4b5be66707c56a156299f67b9e
 Size (ortp-0.16.1.tar.gz) = 466365 bytes
-SHA1 (patch-src_stun.c) = 841d91447489b42134fe4d4f5608bbb6cfaa3a0e
+SHA1 (patch-src_avprofile.c) = 1740714e00d22ed8cde08106a9e5f56d4c40abe7
+SHA1 (patch-src_stun.c) = 487faca256c839d5b15cea7169f3fa14844bb338
 SHA1 (patch-src_tests_rtprecv.c) = 5b42382fcd7ebcaf189fdadea893df42457029dd
diff --git a/net/ortp/patches/patch-src_avprofile.c b/net/ortp/patches/patch-src_avprofile.c
new file mode 100644
index 00000000000..a162a24a1d7
--- /dev/null
+++ b/net/ortp/patches/patch-src_avprofile.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_avprofile.c,v 1.1 2012/06/25 11:49:10 joerg Exp $
+
+--- src/avprofile.c.orig	2009-06-16 10:49:48.000000000 +0000
++++ src/avprofile.c
+@@ -30,7 +30,7 @@ char offset0[4] = {0x00, 0x00, 0x00, 0x0
+  * portability, payload types must be defined with their fields in the right
+  * order.
+  */
+-#if defined(_ISOC99_SOURCE)
++#if defined(_ISOC99_SOURCE) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+ // ISO C99's tagged syntax
+ #define TYPE(val)		.type=(val)
+ #define CLOCK_RATE(val)		.clock_rate=(val)
diff --git a/net/ortp/patches/patch-src_stun.c b/net/ortp/patches/patch-src_stun.c
index 865888d6cce..b77be27b590 100644
--- a/net/ortp/patches/patch-src_stun.c
+++ b/net/ortp/patches/patch-src_stun.c
@@ -1,10 +1,19 @@
-$NetBSD: patch-src_stun.c,v 1.1 2012/03/10 22:07:25 markd Exp $
+$NetBSD: patch-src_stun.c,v 1.2 2012/06/25 11:49:10 joerg Exp $
 
 Fix build with gcc 4.6
 
---- src/stun.c.orig	2012-02-13 09:03:33.121945876 +0000
+--- src/stun.c.orig	2009-06-16 10:49:48.000000000 +0000
 +++ src/stun.c
-@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4
+@@ -398,7 +398,7 @@ stunParseMessage( char* buf, unsigned in
+    char* body;
+    unsigned int size;
+ 	 ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
+-   memset(msg, 0, sizeof(msg));
++   memset(msg, 0, sizeof(*msg));
+ 	
+    if (sizeof(StunMsgHdr) > bufLen)
+    {
+@@ -1984,7 +1984,6 @@ stunSendTest( Socket myFd, StunAddress4 
  	
     bool_t changePort=FALSE;
     bool_t changeIP=FALSE;
@@ -12,7 +21,7 @@ Fix build with gcc 4.6
  
     StunMessage req;
     char buf[STUN_MAX_MESSAGE_SIZE];
-@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4
+@@ -2007,7 +2006,6 @@ stunSendTest( Socket myFd, StunAddress4 
           changeIP=TRUE;
           break;
        case 5:
@@ -20,7 +29,7 @@ Fix build with gcc 4.6
           break;
        default:
           ortp_error("stun: Test %i is unkown\n", testNum);
-@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest,
+@@ -2153,7 +2151,7 @@ stunNatType( StunAddress4 *dest, 
  
     bool_t respTestI=FALSE;
     bool_t isNat=TRUE;
@@ -29,7 +38,7 @@ Fix build with gcc 4.6
     StunAddress4 testImappedAddr;
     bool_t respTestI2=FALSE; 
     bool_t mappedIpSame = TRUE;
-@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest,
+@@ -2336,8 +2334,8 @@ stunNatType( StunAddress4 *dest, 
                          if ( !respTestI )
                          {