apply fixes from FreeBSD ports and fix a typo in our subst

asterisk/asterisk.patch

@@ -410,3 +410,53 @@ Index: utils/Makefile
  
  TARGET=stereorize streamplayer
  
+Index: channels/chan_h323.c
+--- channels/chan_h323.c.orig	2006-08-05 07:08:50 +0200
++++ channels/chan_h323.c	2006-09-05 09:43:50 +0200
+@@ -31,6 +31,7 @@
+  * \ingroup channel_drivers
+  */
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <sys/param.h>
+Index: channels/chan_skinny.c
+--- channels/chan_skinny.c.orig	2006-08-05 07:08:50 +0200
++++ channels/chan_skinny.c	2006-09-05 09:43:50 +0200
+@@ -99,7 +99,7 @@
+ #define htolel(x) (x)
+ #define htoles(x) (x)
+ #else
+-#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__)
++#if defined(SOLARIS) || defined(__Darwin__) || defined(__NetBSD__) || defined(__FreeBSD__)
+ #define __bswap_16(x) \
+      ((((x) & 0xff00) >> 8) | \
+       (((x) & 0x00ff) << 8))
+Index: frame.c
+--- frame.c.orig	2006-07-31 06:06:16 +0200
++++ frame.c	2006-09-05 09:43:50 +0200
+@@ -1055,7 +1055,7 @@
+ {
+ 	switch(buf & TYPE_MASK) {
+ 	case TYPE_DONTSEND:
+-		return 0;
++		return 2;
+ 		break;
+ 	case TYPE_SILENCE:
+ 		return 4;
+Index: rtp.c
+--- rtp.c.orig	2006-07-13 20:44:17 +0200
++++ rtp.c	2006-09-05 09:43:50 +0200
+@@ -962,8 +962,10 @@
+ 		rtp->us.sin_port = htons(x);
+ 		rtp->us.sin_addr = addr;
+ 		/* If there's rtcp, initialize it as well. */
+-		if (rtp->rtcp)
++		if (rtp->rtcp) {
+ 			rtp->rtcp->us.sin_port = htons(x + 1);
++			rtp->rtcp->us.sin_addr = addr;
++		}
+ 		/* Try to bind it/them. */
+ 		if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) &&
+ 			(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))

asterisk/asterisk.spec

@@ -106,7 +106,7 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;/usr/local/bin/mpg123;%{l_prefix}/bin/mpg123;' \
         -e 's;/usr/bin/mpg123;%{l_prefix}/bin/mpg123;' \
-        app/apps_mp3.c
+        apps/app_mp3.c
 
 %build
     #   build program