As previously advertised, complete removal of vulnerable ports that

no one has stepped up to deal with:

archivers/pecl-phar		Vulnerable since 2011-01-13
comms/libsyncml			Depends on devel/libsoup22, which is FORBIDDEN
databases/mysql323-server	Vulnerable since 2006-10-29
databases/mysql323-client	Vulnerable since 2006-10-29
databases/mysql323-scripts	Vulnerable since 2006-10-29
databases/mysql40-server	Vulnerable since 2006-10-29
databases/mysql40-client	Vulnerable since 2006-10-29
databases/mysql40-scripts	Vulnerable since 2006-10-29
databases/p5-DBD-mysql40
		Depends on databases/mysql40-server, which is FORBIDDEN
deskutils/buoh			Depends on devel/libsoup22, which is FORBIDDEN
deskutils/libopensync-plugin-syncml
		Depends on comms/libsyncml, which is DEPRECATED
devel/libsoup22			Vulnerable since 2011-07-28
dns/bind9-sdb-ldap		Vulnerable since 2011-06-04
dns/bind9-sdb-postgresql	Vulnerable since 2011-06-04
ftp/wgetpro			Vulnerable since 2004-12-14
games/quake2forge		Vulnerable since 2005-01-21
graphics/linux-tiff		Vulnerable since 2004-10-13
japanese/mutt			Vulnerable since 2007-07-29
japanese/asterisk14-sounds	Depends on net/asterisk14, which is FORBIDDEN
net/asterisk14			Vulnerable since 2011-06-25
net/isc-dhcp31-client		Vulnerable since 2011-04-10
net/isc-dhcp31-server		Vulnerable since 2011-04-10
net/isc-dhcp31-relay		Vulnerable since 2011-04-10
net/asterisk-app-ldap		Depends on net/asterisk14, which is FORBIDDEN
net/asterisk-app-notify		Depends on net/asterisk14, which is FORBIDDEN
net/asterisk-oh323
   Depends on net/asterisk14, which is FORBIDDEN, does not compile on sparc64
net/asterisk14-addons		Depends on net/asterisk14, which is FORBIDDEN
net/astfax			Depends on net/asterisk14, which is FORBIDDEN
net-mgmt/nagios2		Vulnerable since 2009-06-30
www/gforge			Vulnerable since 2005-08-09
www/linux-flashplugin7		Vulnerable since at least 2008-05-30
www/opera-devel			Vulnerable since 2010-06-25, does not fetch
www/plone3			Vulnerable and unsupported upstream
www/serendipity-devel		Vulnerable since 2008-04-25
www/ziproxy			Vulnerable since 2010-06-15
www/asterisk-gui		Depends on net/asterisk14, which is FORBIDDEN
x11-toolkits/linux-pango	Vulnerable since 2009-05-13

103 files changed, 0 insertions, 15693 deletions

diff --git a/net/Makefile b/net/Makefile
index d675c4bc6196..e79182b198e8 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -28,15 +28,9 @@
     SUBDIR += asio
     SUBDIR += aslookup
     SUBDIR += asterisk
-    SUBDIR += asterisk-app-ldap
-    SUBDIR += asterisk-app-notify
-    SUBDIR += asterisk-oh323
     SUBDIR += asterisk10
-    SUBDIR += asterisk14
-    SUBDIR += asterisk14-addons
     SUBDIR += asterisk16
     SUBDIR += asterisk16-addons
-    SUBDIR += astfax
     SUBDIR += atmsupport
     SUBDIR += avahi
     SUBDIR += avahi-app
@@ -256,9 +250,6 @@
     SUBDIR += ipw-firmware-kmod
     SUBDIR += irrd
     SUBDIR += isc-dhcp3-devel
-    SUBDIR += isc-dhcp31-client
-    SUBDIR += isc-dhcp31-relay
-    SUBDIR += isc-dhcp31-server
     SUBDIR += isc-dhcp41-client
     SUBDIR += isc-dhcp41-relay
     SUBDIR += isc-dhcp41-server
diff --git a/net/asterisk-app-ldap/Makefile b/net/asterisk-app-ldap/Makefile
deleted file mode 100644
index 74825874766c..000000000000
--- a/net/asterisk-app-ldap/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for: app_ldap
-# Date created:		15 April 2007
-# Whom:			Matthias Fechner <idefix@fechner.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk-app-ldap
-DISTVERSION=	2.0rc1
-PORTREVISION=	5
-CATEGORIES=	net
-MASTER_SITES=	http://www.mezzo.net/asterisk/
-DISTNAME=	app_ldap-${DISTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	idefix@fechner.net
-COMMENT=	LDAPget application module for the Asterisk PBX 1.4
-
-DEPRECATED=	Depends on net/asterisk14, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
-BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14
-
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_OPENLDAP=	yes
-
-.include <bsd.port.mk>
diff --git a/net/asterisk-app-ldap/distinfo b/net/asterisk-app-ldap/distinfo
deleted file mode 100644
index 7ba2423f68e5..000000000000
--- a/net/asterisk-app-ldap/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (app_ldap-2.0rc1.tgz) = 7dbafad5c711de18bb57585f0ac9cf8e06a82761f43228db4ead88631dfafadc
-SIZE (app_ldap-2.0rc1.tgz) = 6280
diff --git a/net/asterisk-app-ldap/files/patch-Makefile b/net/asterisk-app-ldap/files/patch-Makefile
deleted file mode 100644
index 924d1e08103b..000000000000
--- a/net/asterisk-app-ldap/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	Tue Apr 17 13:55:00 2007
-+++ Makefile	Tue Apr 17 18:19:37 2007
-@@ -30,6 +30,14 @@
-   CONF_DIR=/etc/asterisk
- endif
- 
-+ifeq ($(OSARCH),FreeBSD)
-+#  CFLAGS+= -D__FreeBSD__
-+  SOLINK=-shared -Xlinker -x -L/usr/local/lib
-+  LIBS=-llber -lldap -liconv
-+  MODULES_DIR=/usr/local/lib/asterisk/modules
-+  CONF_DIR=/usr/local/etc/asterisk
-+endif
-+
- %.so : %.o
- 	$(CC) $(SOLINK) -o $@ $(LIBS) $<
- 
-@@ -39,13 +47,13 @@
- 	rm -f $(NAME).o $(NAME).so
- 
- install: all
--	if ! [ -f $(CONF_DIR)/$(CONF) ]; then \
--		install -m 644 $(CONF).sample $(CONF_DIR)/$(CONF) ; \
-+	if ! [ -f $(CONF_DIR)/$(CONF).sample ]; then \
-+		install -m 644 $(CONF).sample $(CONF_DIR)/$(CONF).sample ; \
- 	fi
- 	if [ -f $(NAME).so ]; then \
- 		install -m 755 $(NAME).so $(MODULES_DIR) ; \
- 	fi
- 
- reload: install
--	asterisk -rx "unload ${RES}"
--	asterisk -rx "load ${RES}"
-+	asterisk -rx "module unload ${RES}"
-+	asterisk -rx "module load ${RES}"
diff --git a/net/asterisk-app-ldap/files/patch-app_ldap.c b/net/asterisk-app-ldap/files/patch-app_ldap.c
deleted file mode 100644
index 82b48b178d6e..000000000000
--- a/net/asterisk-app-ldap/files/patch-app_ldap.c
+++ /dev/null
@@ -1,507 +0,0 @@
---- app_ldap.c.orig	Tue Apr 17 14:14:56 2007
-+++ app_ldap.c	Tue Apr 17 17:06:42 2007
-@@ -9,6 +9,8 @@
-  *
-  */
- 
-+/*#define LDAP_DEPRECATED 1*/
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -33,36 +35,43 @@
- #include <ldap.h>
- 
- #define AST_MODULE "app_notify"
--
- #define LDAP_CONFIG "ldap.conf"
-+#define SIZELIMIT 2048
- 
--int ldap_lookup(const char *host, int port, int version, int timeout, const char *user, const char *pass, const char *base, const char *scope, const char *filter, const char *attribute, char *result);
--int strconvert(const char *incharset, const char *outcharset,
--#ifdef __Darwin__
--               const char *in,
--#else
--               char *in,
--#endif
--               char *out);
-+char *replace_ast_vars(struct ast_channel *chan, const char *string);
-+LDAP* ldap_open_connection(const char *host, int port, int version);
-+int ldap_bind_connection(LDAP *ld, const char *user, const char *pass);
-+int ldap_search_in_connection(LDAP *ld, const char *base, const char *scope, const char *filter, const char *attribute, char *result);
-+int ldap_lookup(const char *host, int port, int version, int timeout, const char *user, const char *pass, 
-+		const char *base, const char *scope, const char *filter, const char *attribute, char *result);
-+int strconvert(const char *incharset, const char *outcharset, const char *in, char *out);
-+char *strtrim (char *string);
- 
- static char *app = "LDAPget";
- static char *synopsis = "Retrieve a value from an ldap directory";
- 
- static char *descrip =
--  "  LDAPget(varname=config-file-section/key): Retrieves a value from an LDAP\n"
--  "directory and stores it in the given variable. Always returns 0.  If the\n"
--  "requested key is not found, jumps to priority n+101 if available.\n";
-+"  LDAPget(varname=config-file-section/key): Retrieves a value from an LDAP\n"
-+"directory and stores it in the given variable. Always returns 0.  If the\n"
-+"requested key is not found, jumps to priority n+101 if available.\n";
-+
- 
- static int ldap_exec (struct ast_channel *chan, void *data)
- {
-   int arglen;
-   struct ast_module_user *u;
-   char *argv, *varname, *config, *keys = NULL, *key = NULL, *tail = NULL;
-+#ifdef __FreeBSD__
-+  char result[SIZELIMIT+1];
-+#else
-   char result[2048];
-+#endif
-+  memset(result,0,sizeof(result));
-+  
-   char *result_conv;
-   struct ast_config *cfg;
- 
--  int port = LDAP_PORT, version = LDAP_VERSION2, timeout = 10;
-+  int port = LDAP_PORT, version = LDAP_VERSION3, timeout = 10;
-   const char *temp, *host, *user, *pass, *_base, *scope, *_filter, *attribute;
-   char *convert, *convert_from = NULL, *convert_to = NULL, *filter, *base;
- 
-@@ -127,8 +136,8 @@ static int ldap_exec (struct ast_channel
-   if (!(scope = ast_variable_retrieve(cfg, config, "scope"))) {
-     scope = "sub";
-   }
--  if(!(_base = ast_variable_retrieve(cfg, config, "base"))) {
--    _base = "";
-+  if(!(_base = ast_variable_retrieve(cfg, config, "base"))){
-+     _base = "";
-   }
-   if(!(_filter = ast_variable_retrieve(cfg, config, "filter"))) {
-     _filter = "(&(objectClass=*)(telephoneNumber=${CALLERID(number)}))";
-@@ -136,7 +145,7 @@ static int ldap_exec (struct ast_channel
-   if(!(attribute = ast_variable_retrieve(cfg, config, "attribute"))) {
-     attribute = "cn";
-   }
--	
-+
-   if((temp = ast_variable_retrieve(cfg, config, "convert"))) {
-     convert = ast_strdupa(temp);
-     if(strchr(convert, ',')) {
-@@ -146,7 +155,7 @@ static int ldap_exec (struct ast_channel
-       ast_log(LOG_WARNING, "syntax error: convert = <source-charset>,<destination charset>\n");
-     }
-   }
--	
-+
-   if(option_verbose > 3)
-     ast_verbose (VERBOSE_PREFIX_4 "LDAPget: ldap://%s/%s?%s?%s?%s\n", host, _base, attribute, scope, _filter);
- 
-@@ -160,12 +169,16 @@ static int ldap_exec (struct ast_channel
-   memset(base, 0, slen);
-   pbx_substitute_variables_helper(chan, _base, base, slen);
- 
-+//  ast_log(LOG_WARNING, "LDAPget: filter: after replace_ast_vars in main: -%s-\n", filter);
-+  if(option_verbose > 3)
-+    ast_verbose (VERBOSE_PREFIX_4 "LDAPget: replaced string: %s\n", filter);
-+
-   if(keys && strstr(filter, "%s") != NULL) {
-     filter = (char *)ast_realloc(filter, (strlen(filter)+strlen(keys)+1)*sizeof(char));
-     while((key = strsep(&keys, "|")) != NULL) {
-       if((tail = strstr(filter, "%s")) != NULL) {
--				memmove(tail+strlen(key), tail+2, strlen(tail+2)+1);
--				memcpy(tail, key, strlen(key));
-+	 memmove(tail+strlen(key), tail+2, strlen(tail+2)+1);
-+	 memcpy(tail, key, strlen(key));
-       }
-     }
-   }
-@@ -173,86 +186,146 @@ static int ldap_exec (struct ast_channel
-   if(option_verbose > 2)
-     ast_verbose (VERBOSE_PREFIX_3 "LDAPget: ldap://%s/%s?%s?%s?%s\n", host, base, attribute, scope, filter);
- 
-+//  ast_log(LOG_WARNING, "LDAPget: filter before ldap_lookup: -%s-\n", filter);
-   if(ldap_lookup(host, port, version, timeout, user, pass, base, scope, filter, attribute, result)) {
- 
--    if(convert_from) {
-+    if(convert_from && strlen(result)>0) {
-       if(option_verbose > 2)
--				ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: %s -> %s\n", convert_from, convert_to);
-+	ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: %s -> %s\n", convert_from, convert_to);
-       result_conv = alloca(strlen(result) * 2);
--      strconvert(convert_from, convert_to, result, result_conv);
-+      strconvert(convert_from, convert_to, (const char*)result, result_conv);
-       strcpy(result, result_conv);
-     }
--
--
-+		
-     if(strcmp("CALLERIDNAME", varname)==0 || strcmp("CALLERID(name)", varname)==0) {
- #ifdef CHANNEL_HAS_CID
-+       if(option_verbose > 2)
-+	  ast_verbose(VERBOSE_PREFIX_3 "LDAPget: set callerid with HAS_CID ast_set_callerid\n");
-       ast_set_callerid(chan, NULL, result, NULL);
- #else
-       char *cidnum, *cidname, newcid[512] = "";
-       ast_callerid_parse(chan->callerid, &cidname, &cidnum);
-       snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", result, cidnum);
-+      if(option_verbose > 2)
-+	 ast_verbose(VERBOSE_PREFIX_3 "LDAPget: set callerid with NO HAS_CID ast_set_callerid\n");
-       ast_set_callerid(chan, newcid, 0);
- #endif
-     } else {
-       pbx_builtin_setvar_helper(chan, varname, result);
-     }
--		if(option_verbose > 2)
--			ast_verbose (VERBOSE_PREFIX_3 "LDAPget: set %s='%s'\n", varname, result);
-+    if(option_verbose > 2)
-+       ast_verbose (VERBOSE_PREFIX_3 "LDAPget: set %s='%s'\n", varname, result);
-+		
-   } else {
-     /* Send the call to n+101 priority, where n is the current priority */
-     if(ast_exists_extension (chan, chan->context, chan->exten, chan->priority + 101, 
- #ifdef CHANNEL_HAS_CID
--														 chan->cid.cid_num
-+			     chan->cid.cid_num
- #else
--														 chan->callerid
-+			     chan->callerid
- #endif
--														 ))
-+			     ))
-       chan->priority += 100;
-   }
--	
- #ifdef NEW_CONFIG
-   ast_config_destroy(cfg);
- #else
-   ast_destroy(cfg);
- #endif
--	
-   ast_module_user_remove(u);
-+  
-   return 0;
- }
- 
--
--int ldap_lookup(const char *host, int port, int version, int timeout, const char *user, const char *pass, 
--		const char *base, const char *scope, const char *filter, const char *attribute, char *result) {
--  char *attrs[] = { NULL };
--  char **values;
--  LDAP *ld;
--  LDAPMessage *res, *entry;
--  int ret, ldap_scope = LDAP_SCOPE_SUBTREE;
--
--  ld = ldap_init(host, port);
--  if(!ld) {
--    ast_log(LOG_WARNING, "LDAPget: unable to initialize ldap connection to %s:%d\n", host, port);
-+LDAP* ldap_open_connection(const char *host, int port, int version)
-+{
-+   LDAP *ld=NULL;
-+   LDAPURLDesc url;
-+   char *ldapuri=NULL;
-+   int ret;
-+//   int ldap_debug=0xffff;
-+   int ldap_debug=0;
-+   
-+   // Open connection to the LDAP server
-+   memset(&url, 0, sizeof(url));
-+   url.lud_host=host;
-+   url.lud_port=port;
-+   url.lud_scope=LDAP_SCOPE_DEFAULT;
-+   url.lud_scheme="ldap";
-+   
-+   ldapuri=ldap_url_desc2str(&url);
-+   (void) ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldap_debug);
-+   
-+   if(option_verbose > 2)
-+      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: open connection to %s with version: %d\n", ldapuri, version);
-+   ret = ldap_initialize(&ld, ldapuri);
-+  if(ret != LDAP_SUCCESS) {
-+    ast_log(LOG_WARNING, "LDAPget: unable to initialize ldap connection to %s(%d)\n", ldap_err2string(ret),ret);
-     return 0;
-   }
-+  
-+  // Disable option referrals
-+  if(ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF) != LDAP_OPT_SUCCESS)
-+  {
-+     ast_log(LOG_WARNING, "LDAPget: unable to disable LDAP_OPT_REFERRALS\n");
-+     return 0;
-+  }
- 
--  ldap_set_option(ld, LDAP_OPT_TIMELIMIT, &timeout);
--  ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
--
--  if(user) {
--    if (option_verbose > 2)
--      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to %s as %s\n", host, user);
--    ret = ldap_simple_bind_s(ld, user, pass);
--  } else {
--    if (option_verbose > 2)
--      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to %s anonymously\n", host);
--    ret = ldap_simple_bind_s(ld, NULL, NULL);
--  }
--  if(ret) {
--    ast_log(LOG_WARNING, "LDAPget: bind failed: %s\n", ldap_err2string(ret));
--    ldap_unbind(ld);
--    return 0;
-+  // set protocol to version
-+  if(ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version)!= LDAP_OPT_SUCCESS)
-+  {
-+     ast_log(LOG_WARNING, "LDAPget: unable to set LDAP_OPT_PROTOCOL_VERSION %d\n",version);
-+     return 0;
-   }
-+  return ld;
-+}
- 
-+int ldap_bind_connection(LDAP *ld, const char *user, const char *pass)
-+{
-+   int rc;
-+   char *sasl_secprops=NULL;
-+   
-+   if( sasl_secprops != NULL)
-+   {
-+      rc= ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS, (void *) sasl_secprops);
-+      if(rc != LDAP_OPT_SUCCESS)
-+      {
-+	 ast_log(LOG_WARNING, "LDAPget: Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n", sasl_secprops);
-+	 return 0;
-+      }
-+   }
-+   if(option_verbose > 2)
-+      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind as %s\n", user);
-+
-+   struct berval passwd= {0, NULL};
-+   passwd.bv_val=ber_strdup(pass);
-+   passwd.bv_len=strlen(passwd.bv_val);
-+   
-+   rc=ldap_sasl_bind_s(ld, user, NULL, &passwd, NULL, NULL, NULL);
-+   
-+   if(rc != LDAP_SUCCESS)
-+   {
-+	 ast_log(LOG_WARNING, "LDAPget: ldap_sasl_interactive_bind_s failed: %s (%d)\n", ldap_err2string(rc),rc);
-+	 return 0;
-+   }
-+   
-+   return 1;
-+}
-+
-+
-+int ldap_search_in_connection(LDAP *ld, const char *base, const char *scope, const char *filter, const char *attribute, char *result)
-+{
-+  char *attrs[] = { NULL };
-+  int ret, ldap_scope = LDAP_SCOPE_SUBTREE;
-+  LDAPMessage *msg, *res;
-+  int num_entries=0;
-+  int msgtype;
-+  char *dn, *a;
-+  BerElement *ber=NULL;
-+  struct berval **vals;
-+  struct berval val;
-+  
-+//  ast_log(LOG_WARNING, "LDAPget: filter start of ldap_search_in_connections: -%s-\n", filter);
-   if(strncmp(scope,"sub",3)==0) {
-     ldap_scope = LDAP_SCOPE_SUBTREE;
-   } else if(strncmp(scope,"base",4)==0) {
-@@ -261,82 +334,146 @@ int ldap_lookup(const char *host, int po
-     ldap_scope = LDAP_SCOPE_ONELEVEL;
-   }
- 
--  ret = ldap_search_s(ld, base, ldap_scope, filter, attrs, 0, &res);
--  if(ret) {
--    ast_log(LOG_WARNING, "LDAPget: search failed: %s\n", ldap_err2string(ret));
--    if(version==2)
--      ast_log(LOG_WARNING, "LDAPget: you may try version=3 in your asterisk ldap.conf file.\n");
-+  if(option_verbose > 2)
-+     ast_verbose(VERBOSE_PREFIX_3 "LDAPget: send search command to LDAP server\n");
-+  ret = ldap_search_ext_s(ld, base, ldap_scope, filter, attrs, 0, NULL, NULL, NULL, SIZELIMIT, &res);
-+  if(ret != LDAP_SUCCESS) {
-+    ast_log(LOG_WARNING, "LDAPget: search failed: %s (%d)\n", ldap_err2string(ret),ret);
-+    ast_log(LOG_WARNING, "LDAPget: filter: %s\n", filter);
-+// XXXX need to check
-     ldap_msgfree(res);
--    ldap_unbind(ld);
-+    ldap_unbind_ext_s(ld,NULL,NULL);
-+    ast_log(LOG_WARNING, "LDAPget: search failed resourceses released, cancel search\n");
-     return 0;
-   }
-+  num_entries=ldap_count_entries(ld, res);
-+  msg=ldap_first_message(ld, res);
-+  msgtype=ldap_msgtype(msg);
- 
--  entry = ldap_first_entry(ld, res);
--  if(!entry) {
--    if(option_verbose > 2)
--      ast_verbose (VERBOSE_PREFIX_3 "LDAPget: Value not found in directory.\n");
--    ldap_msgfree(res);
--    ldap_unbind(ld);
--    return 0;
--  }
-+  if(option_verbose > 2)
-+     ast_verbose(VERBOSE_PREFIX_3 "LDAPget: found %d entry in LDAP server\n", num_entries);
- 
--  values = ldap_get_values(ld, entry, attribute);
--  if(values && values[0]) {
--    memset(result, 0, strlen(values[0]));
--    strncpy(result, values[0], strlen(values[0]));
--    result[strlen(values[0])] = '\0';
--    if (option_verbose > 2)
--      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: %s=%s\n", attribute, result);
--  } else {
--    if (option_verbose > 2)
--      ast_verbose (VERBOSE_PREFIX_3 "LDAPget: %s not found.\n", attribute);
--    ldap_msgfree(res);
--    ldap_unbind(ld);
--    return 0;
-+  for ( msg = ldap_first_message( ld, res ); msg != NULL; msg = ldap_next_message( ld, msg ) ) {
-+     /* Determine what type of message was sent from the server. */
-+     
-+     msgtype = ldap_msgtype( msg );
-+     switch( msgtype ) {
-+	/* If the result was an entry found by the search, get and print the
-+	   attributes and values of the entry. */
-+	case LDAP_RES_SEARCH_ENTRY:
-+	   /* Get and print the DN of the entry. */
-+	   if(option_verbose > 2)
-+	      ast_verbose(VERBOSE_PREFIX_3 "Found a LDAP_RES_SEARCH_ENTRY\n");
-+	   ret=ldap_get_dn_ber(ld,msg,&ber,&val);
-+	   
-+	   if (( dn = ldap_get_dn( ld, res )) != NULL ) {
-+	      ldap_memfree( dn );
-+	   }
-+	   /* Iterate through each attribute in the entry. */
-+	   for ( a = ldap_first_attribute( ld, res, &ber );
-+		 a != NULL; a = ldap_next_attribute( ld, res, ber ) ) {
-+	      /* Get the searched attribute and value */
-+	      if(!strcmp(a,attribute))
-+	      {
-+		 
-+		 if (( vals = ldap_get_values_len( ld, res, a )) != NULL ) {
-+		    val=*vals[0];
-+		    // remove space at end of string
-+		    if(val.bv_val[val.bv_len-1]==' ')
-+		    {
-+		       val.bv_len--;
-+//		       val.bv_val[val.bv_len]=NULL;
-+		    }
-+		    if(option_verbose > 2)
-+		       ast_verbose(VERBOSE_PREFIX_3 "Found <%s>: <%s>\n", a, val.bv_val);
-+		    memcpy(result,val.bv_val,val.bv_len);
-+		    ldap_value_free_len( vals );
-+		    ldap_memfree(a);
-+		    break;
-+		 }
-+	      }
-+	      ldap_memfree( a );
-+	   }
-+	   if ( ber != NULL ) {
-+	      ber_free( ber, 0 );
-+	   }
-+	   break;
-+	case LDAP_RES_SEARCH_REFERENCE:
-+	   if(option_verbose > 2)
-+	      ast_verbose(VERBOSE_PREFIX_3 "LDAP_RES_SEARCH_REFERENCE\n");
-+	   break;
-+	case LDAP_RES_SEARCH_RESULT:
-+	   if(option_verbose > 2)
-+	      ast_verbose(VERBOSE_PREFIX_3 "LDAPRES_SERCH_RESULT\n");
-+	   break;
-+	default:
-+	   break;
-+     }
-   }
--  ldap_value_free(values);
--
--  ldap_msgfree(res);
--  ldap_unbind_s(ld);
--  
-   return 1;
- }
- 
--int strconvert(const char *incharset, const char *outcharset,
--#ifdef __Darwin__
--               const char *in,
--#else
--               char *in,
--#endif
--               char *out) {
-+int ldap_lookup(const char *host, int port, int version, int timeout, const char *user, const char *pass, 
-+		const char *base, const char *scope, const char *filter, const char *attribute, char *result) {
-+   LDAP *ld=NULL;
-+   
-+//   ast_log(LOG_WARNING, "LDAPget: filter in ldap_lookup: -%s-\n", filter);
-+   // open connection to LDAP server
-+   if(option_verbose > 2)
-+      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: Initialize connection to LDAP server\n");
-+   ld=ldap_open_connection(host, port, version);
-+   if(ld==0)
-+      return 0;
-+   
-+   // authenticate to the LDAP-Server
-+   if(option_verbose > 2)
-+      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: bind to LDAP server\n");
-+   if(ldap_bind_connection(ld, user, pass) == 0)
-+      return 0;
-+   
-+   // Search in the LDAP directory
-+   if(option_verbose > 2)
-+      ast_verbose(VERBOSE_PREFIX_3 "LDAPget: search attribute %s in LDAP directory\n", attribute);
-+   if(ldap_search_in_connection(ld, base, scope, filter, attribute, result)==0)
-+      return 0;
-+   
-+   // Close connection to the LDAP server
-+   int err = ldap_set_option(ld, LDAP_OPT_SERVER_CONTROLS, NULL);
-+   if(err != LDAP_OPT_SUCCESS)
-+   {
-+      ast_log(LOG_WARNING, "LDAPget: Could not unset controls\n");
-+   }
-+   
-+   ldap_unbind_ext_s(ld, NULL, NULL);
-+   return 1;
-+}
-+
-+
-+int strconvert(const char *incharset, const char *outcharset, const char *in, char *out) 
-+{
-   iconv_t cd;
--  size_t incount = strlen(in), outcount = strlen(in)*2, result;
--  cd = iconv_open(outcharset, incharset);
--  if(cd == (iconv_t) -1) {
--    ast_log(LOG_ERROR, "conversion from '%s' to '%s' not available. type 'iconv -l' in a shell to list the supported charsets.\n", incharset, outcharset);
--    memcpy(out, in, strlen(in)+1);
-+  size_t incount, outcount, result;
-+  incount = outcount = strlen(in) * 2;
-+  if((cd = iconv_open(outcharset, incharset)) == (iconv_t)-1) {
-+    if(errno == EINVAL) ast_log(LOG_DEBUG, "conversion from '%s' to '%s' not available", incharset, outcharset);
-+    *out = L'\0';
-     return -1;
-   }
-+  if(option_verbose > 2)
-+     ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: now with icon string: %s\n", in);
-   result = iconv(cd, &in, &incount, &out, &outcount);
--  if(result == (size_t)-1) {
--    if(errno == E2BIG) {
--      ast_log(LOG_WARNING, "Iconv: output buffer too small.\n");
--    } else if(errno == EILSEQ) {
--      ast_log(LOG_WARNING,  "Iconv: illegal character.\n");
--    } else if(errno == EINVAL) {
--      ast_log(LOG_WARNING,  "Iconv: incomplete character sequence.\n");
--    } else {
--      ast_log(LOG_WARNING,  "Iconv: error.\n");
--    }
--  }
-+  if(option_verbose > 2)
-+     ast_verbose(VERBOSE_PREFIX_3 "LDAPget: convert: close inconv %d\n",result);
-   iconv_close(cd);
--  *out = '\0';
-+  if(option_verbose > 2)
-+     ast_verbose(VERBOSE_PREFIX_3 "LDAPget: result with icon\n");
-+  out[strlen(out)] = '\0';
-   return 1;
- }
- 
- static int load_module(void)
- {
--  return ast_register_application(app, ldap_exec, synopsis, descrip);
-+   return ast_register_application(app, ldap_exec, synopsis, descrip);
- }
- 
- static int unload_module(void)
diff --git a/net/asterisk-app-ldap/files/patch-cflags.sh b/net/asterisk-app-ldap/files/patch-cflags.sh
deleted file mode 100644
index 66577ae7ccfb..000000000000
--- a/net/asterisk-app-ldap/files/patch-cflags.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- cflags.sh.orig	Tue Apr 17 14:11:19 2007
-+++ cflags.sh	Tue Apr 17 14:13:40 2007
-@@ -11,6 +11,11 @@ else
-   INCDIR=/usr/include/asterisk
- fi
- 
-+if [ ${OSARCH} = "FreeBSD" ]; then
-+  INCDIR=/usr/local/include/asterisk
-+  CFLAGS="${CFLAGS} -I/usr/local/include -L/usr/local/lib"
-+fi
-+
- CHANNEL_H=${INCDIR}/channel.h
- if [ "`grep 'struct ast_callerid cid' ${CHANNEL_H}`" != "" ]; then
-     CFLAGS="${CFLAGS} -DCHANNEL_HAS_CID"
diff --git a/net/asterisk-app-ldap/pkg-descr b/net/asterisk-app-ldap/pkg-descr
deleted file mode 100644
index b63e27a22826..000000000000
--- a/net/asterisk-app-ldap/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-LDAPget is an Asterisk application for data retrieval from LDAP
-directories (e.g. OpenLDAP or ActiveDirectory). This version works
-with asterisk 1.4.
-
-WWW: http://www.mezzo.net/asterisk/app_ldap.html
diff --git a/net/asterisk-app-ldap/pkg-plist b/net/asterisk-app-ldap/pkg-plist
deleted file mode 100644
index c352a00f73cf..000000000000
--- a/net/asterisk-app-ldap/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/asterisk/modules/app_ldap.so
-etc/asterisk/ldap.conf.sample
diff --git a/net/asterisk-app-notify/Makefile b/net/asterisk-app-notify/Makefile
deleted file mode 100644
index 73a7bdf92c9a..000000000000
--- a/net/asterisk-app-notify/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	app_notify
-# Date created:				23 March 2007
-# Whom:					mayo
-#
-# $FreeBSD$
-#
-
-PORTNAME=	app_notify
-DISTVERSION=	2.0rc1
-PORTREVISION=	7
-CATEGORIES=	net
-MASTER_SITES=	http://www.mezzo.net/asterisk/ \
-		http://static.oyam.ca/freebsd/ports/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	mayo@oyam.ca
-COMMENT=	Notify application module for the Asterisk PBX
-
-DEPRECATED=	Depends on net/asterisk14, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
-BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14
-RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14
-
-USE_GMAKE=	yes
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net/asterisk-app-notify/distinfo b/net/asterisk-app-notify/distinfo
deleted file mode 100644
index d73a2e3cd8fb..000000000000
--- a/net/asterisk-app-notify/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (app_notify-2.0rc1.tgz) = b3eb3a7b1f567c9bb0d44406d3425de3062194411d0559f2c9c547926e3ad0cf
-SIZE (app_notify-2.0rc1.tgz) = 4053
diff --git a/net/asterisk-app-notify/files/patch-Makefile b/net/asterisk-app-notify/files/patch-Makefile
deleted file mode 100644
index 31370c7b29f0..000000000000
--- a/net/asterisk-app-notify/files/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	Thu Feb  1 04:08:39 2007
-+++ Makefile	Thu Oct 25 00:05:18 2007
-@@ -7,6 +7,7 @@
- #
- 
- NAME=app_notify
-+CONF=extensions_dialer.conf
- 
- CC=gcc
- CFLAGS=$(shell ./cflags.sh)
-@@ -21,7 +22,7 @@
- 	CC=gcc -arch ppc -arch i386
- else
-   SOLINK=-shared -Xlinker -x
--  MODULES_DIR=/usr/lib/asterisk/modules
-+  MODULES_DIR=$(LOCALBASE)/lib/asterisk/modules
- endif
- 
- RES=$(NAME).so
-@@ -35,6 +36,7 @@
- 	rm -f $(NAME).o $(NAME).so notifyClient.o notifyClient sampleClient
- 
- install: all
-+	install -m 644 $(CONF).sample $(LOCALBASE)/etc/asterisk/$(CONF).sample ; \
- 	if [ -f $(NAME).so ]; then \
- 		install -m 755 $(NAME).so $(MODULES_DIR) ; \
- 	fi
diff --git a/net/asterisk-app-notify/files/patch-cflags.sh b/net/asterisk-app-notify/files/patch-cflags.sh
deleted file mode 100644
index 15483921b9b4..000000000000
--- a/net/asterisk-app-notify/files/patch-cflags.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- cflags.sh.orig	Wed Oct 24 23:37:00 2007
-+++ cflags.sh	Wed Oct 24 23:31:46 2007
-@@ -8,7 +8,8 @@
-   INCDIR=/Library/Asterisk/include
-   CFLAGS="${CFLAGS} -I/Library/Asterisk/include"
- else
--  INCDIR=/usr/include
-+  INCDIR=${LOCALBASE}/include
-+  CFLAGS="${CFLAGS} -I${INCDIR}"
- fi
- 
- CHANNEL_H=${INCDIR}/asterisk/channel.h
diff --git a/net/asterisk-app-notify/pkg-descr b/net/asterisk-app-notify/pkg-descr
deleted file mode 100644
index 7e2c76bac340..000000000000
--- a/net/asterisk-app-notify/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk Notify is an Asterisk module which can be configured to send
-notifications over the network to announce the callers name and telephone
-number to a desktop PC.
-
-WWW: http://www.mezzo.net/asterisk/app_notify.html
diff --git a/net/asterisk-app-notify/pkg-message b/net/asterisk-app-notify/pkg-message
deleted file mode 100644
index 6b1a948a654b..000000000000
--- a/net/asterisk-app-notify/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-*****************************************************************************
-
-a) If this is a new install, restart Asterisk or activate the module by
-   running:
-
-   # asterisk -rx "module load app_notify"
-
-b) If this is an upgrade, you can restart Asterisk or reload the module by
-   running:
-
-   # asterisk -rx "module unload app_notify"
-   # asterisk -rx "module load app_notify"
-
-*****************************************************************************
diff --git a/net/asterisk-app-notify/pkg-plist b/net/asterisk-app-notify/pkg-plist
deleted file mode 100644
index 58e21b95faf0..000000000000
--- a/net/asterisk-app-notify/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/asterisk/extensions_dialer.conf.sample
-lib/asterisk/modules/app_notify.so
diff --git a/net/asterisk-oh323/Makefile b/net/asterisk-oh323/Makefile
deleted file mode 100644
index 3c7ddc1abd1a..000000000000
--- a/net/asterisk-oh323/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	asterisk-oh323
-# Date created:		17 Jun 2005
-# Whom:			Andriy Pylypenko <bamby@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk-oh323
-PORTVERSION=	0.7.3.1
-PORTREVISION=	4
-CATEGORIES=	net
-MASTER_SITES=	http://www.b2bua.org/chrome/site/
-
-MAINTAINER=	bamby@sippysoft.com
-COMMENT=	A H.323 support module for the Asterisk soft PBX
-
-DEPRECATED=	Depends on net/asterisk14, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
-BUILD_DEPENDS= 	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk14
-LIB_DEPENDS= 	pt_r.1:${PORTSDIR}/devel/pwlib\
-	    	h323_r.1:${PORTSDIR}/net/openh323
-
-USE_GMAKE=	yes
-MAKE_ENV=	MKDIR="${MKDIR}" \
-		PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		CPP="${CXX}" \
-		SYSLIBDIR=${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-# XXX: bsd.gcc.mk now defines CPP
-CPP=		"${CXX}"
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-pre-configure:
-	if ${GREP} -sq fixup_codecs ${LOCALBASE}/include/asterisk/channel.h; \
-	then \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/codecnego.diff; \
-	fi
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk-oh323/distinfo b/net/asterisk-oh323/distinfo
deleted file mode 100644
index 34cad5d544ba..000000000000
--- a/net/asterisk-oh323/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (asterisk-oh323-0.7.3.1.tar.gz) = 723525b07e119b5e4c55f4bab240994b2e9b061c65fa2fcf5650b75873a82d98
-SIZE (asterisk-oh323-0.7.3.1.tar.gz) = 92142
diff --git a/net/asterisk-oh323/files/codecnego.diff b/net/asterisk-oh323/files/codecnego.diff
deleted file mode 100644
index 9d600ce2530e..000000000000
--- a/net/asterisk-oh323/files/codecnego.diff
+++ /dev/null
@@ -1,99 +0,0 @@
---- asterisk-driver/chan_oh323.c.orig	2008-03-21 15:06:22.000000000 +0200
-+++ asterisk-driver/chan_oh323.c	2008-03-21 15:17:00.000000000 +0200
-@@ -966,7 +966,7 @@
- 
- /******************************************************************************/
- 
--static struct ast_channel *oh323_request(const char *type, int format, void *data, int *cause);
-+static struct ast_channel *oh323_request(const char *type, const struct ast_codec_pref *formats, void *data, int *cause);
- static int oh323_text(struct ast_channel *c, const char *text);
- static int oh323_call(struct ast_channel *c, char *dest, int timeout);
- static int oh323_hangup(struct ast_channel *c);
-@@ -2425,11 +2425,11 @@
- 	}
- 
- 	/* Check for format changes */
--	if (f->subclass != i->owner->nativeformats) {
-+	if (!(f->subclass & ast_codec_pref_bits(&i->owner->nativeformats))) {
- 		ast_log(LOG_NOTICE, "%s: Format changed to %s (native %s).\n", 
- 						c->name, 
- 						ast_getformatname(f->subclass),
--						ast_getformatname(c->nativeformats));
-+						ast_codec_pref_dump(buf, sizeof(buf), &c->nativeformats));
- 		if (ast_set_write_format(c, f->subclass) < 0) {
- 			ast_mutex_unlock(&oh323_tab_lock);
- 			return(-1);
-@@ -2830,8 +2830,8 @@
- 
- 	/* Set our native format */
- 	/* XXX: Only one should be selected */
--	tmp->nativeformats = oh323_capability;
--	fmt = oh323_codec_choose(tmp->nativeformats);
-+	ast_codec_pref_append_missing2(&tmp->nativeformats, oh323_capability);
-+	fmt = oh323_codec_choose(ast_codec_pref_index_audio(&tmp->nativeformats, 0));
- 	/*fmt = ast_best_codec(tmp->nativeformats);*/
- 
- 	tmp->writeformat = fmt;
-@@ -2943,23 +2943,16 @@
-  * This function limits the number of outbound H.323 calls.
-  * Return NULL on error, the pointer to the channel on success.
-  */
--static struct ast_channel *oh323_request(const char *type, int format, void *data, int *cause)
-+static struct ast_channel *oh323_request(const char *type, const struct ast_codec_pref *formats, void *data, int *cause)
- {
--	int i=0, count, simcount, oldformat;
-+	int i=0, count, simcount;
- 	struct ast_channel *c;
- 	char *dest = data;
-+	char tmp[100];
- 
- 	if (option_debug)
- 		ast_log(LOG_DEBUG, "In oh323_request: type=%s, format=%d, data=%s.\n", 
--						type, format, (char *)data);
--
--	/* Check the format requested */
--	oldformat = format;
--	format &= oh323_full_capability;
--	if (!format) {
--		ast_log(LOG_ERROR, "Asked to get a channel of unsupported format '%d'\n", format);
--		return NULL;
--	}
-+						type, ast_codec_pref_bits(formats), (char *)data);
- 
- 	ast_mutex_lock(&oh323_tab_lock);
- 
-@@ -3019,12 +3012,12 @@
- 	oh323_tab[i]->owner = c;
- 
- 	/* Specify our native formats */
--	c->nativeformats = format;
--	c->rawwriteformat = format;
--	c->rawreadformat = format;
-+	memcpy(&c->nativeformats, formats, sizeof(*formats));
-+	c->rawwriteformat = 
-+	c->rawreadformat = ast_codec_pref_index_audio(formats, 0);
- 	if (option_debug)
- 		ast_log(LOG_DEBUG, "%s: Native format changed to %s.\n", 
--									c->name, ast_getformatname(format));
-+									c->name, ast_codec_pref_dump(tmp, sizeof(tmp), formats));
- 
- 	ast_mutex_unlock(&oh323_tab_lock);
- 	return c;
-@@ -3455,7 +3448,7 @@
- 				ast_log(LOG_DEBUG, "Setting channel '%s' native format to %s!\n", 
- 								oh323_tab[i]->owner->name,
- 								ast_getformatname(oh323_tab[i]->capability));
--			oh323_tab[i]->owner->nativeformats = oh323_tab[i]->capability;
-+			ast_codec_pref_append_missing2(&oh323_tab[i]->owner->nativeformats, oh323_tab[i]->capability);
- 		}
- 
- 		/* Set environment variables */
-@@ -3528,7 +3521,7 @@
- 				ast_log(LOG_DEBUG, "Setting channel '%s' native format to %s!\n", 
- 								oh323_tab[i]->owner->name,
- 								ast_getformatname(oh323_tab[i]->capability));
--			oh323_tab[i]->owner->nativeformats = oh323_tab[i]->capability;
-+			ast_codec_pref_append_missing2(&oh323_tab[i]->owner->nativeformats, oh323_tab[i]->capability);
- 			if (oh323_tab[i]->tx_smooth) {
- 				ast_smoother_free(oh323_tab[i]->tx_smooth);
- 				oh323_tab[i]->tx_smooth = NULL;
diff --git a/net/asterisk-oh323/files/patch-Makefile b/net/asterisk-oh323/files/patch-Makefile
deleted file mode 100644
index 61fa3ecf34c5..000000000000
--- a/net/asterisk-oh323/files/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig	2008-03-20 16:49:39.000000000 +0200
-+++ Makefile	2008-03-20 17:58:09.000000000 +0200
-@@ -41,7 +41,7 @@
- # Install everything under this directory. If this is empty, then everything
- # will be installed under /
- #
--DESTDIR=/root/src/asterisk-oh323/debian-420641/slash
-+DESTDIR=$(PREFIX)
- 
- #
- # Set PWLIBDIR variable to the directory containing the sources of 
-@@ -51,7 +51,7 @@
- # compile asterisk-oh323. Do not use the installed library of your
- # distribution. It won't work.
- #
--PWLIBDIR=/root/src/asterisk-oh323/debian-420641/pwlib
-+PWLIBDIR?=/root/src/asterisk-oh323/debian-420641/pwlib
- 
- #
- # Set OPENH323LIBDIR variable to the directory containing the sources of
-@@ -61,13 +61,13 @@
- # compile asterisk-oh323. Do not use the installed library of your
- # distribution. It won't work.
- #
--OPENH323DIR=/root/src/asterisk-oh323/debian-420641/openh323
-+OPENH323DIR?=/root/src/asterisk-oh323/debian-420641/openh323
- 
- #
- # Set ASTERISKINCDIR variable to the directory containing the include files of
- # Asterisk PBX.
- #
--ASTERISKINCDIR=/root/src/asterisk-oh323/debian-420641/slash/include
-+ASTERISKINCDIR=$(LOCALBASE)/include
- 
- #
- # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
-@@ -93,7 +93,7 @@
- #
- # Note: This directory is created under $DESTDIR.
- #
--OH323WRAPLIBDIR=/usr/lib
-+OH323WRAPLIBDIR=/lib
- 
- #
- # Set WRAPTRACING to 1 to enable tracing information from the OpenH323Wrap
-@@ -120,7 +120,7 @@
- # With this flag on the channel driver is huge, in size, but Asterisk boots
- # faster!
- #
--OH323STAT=1
-+#OH323STAT=1
- 
- #
- # Define options that were used during Asterisk compilation. It is
diff --git a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile b/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
deleted file mode 100644
index 5e04c0e91046..000000000000
--- a/net/asterisk-oh323/files/patch-asterisk-driver::Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-
-$FreeBSD$
-
---- asterisk-driver/Makefile.orig
-+++ asterisk-driver/Makefile
-@@ -34,23 +34,23 @@
- ifndef SKIP_SUFFIX
- 	ifeq ($(OH323STAT),1)
- 		ifeq ($(OH323BUILDTYPE),debug) # Static, debug
--			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*_d_s.a))
-+			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*_d_s.a))
- 		else                           # Static, opt
--			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*_r_s.a))
-+			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*_r_s.a))
- 		endif
- 	else
- 		ifeq ($(OH323BUILDTYPE),debug) # Shared, debug
--			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*d.so))
-+			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*d.so))
- 		else                           # Shared, opt
--			LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*r.so))
-+			LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/libpt*r.so))
- 		endif
- 	endif
- 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
- else
- 	ifeq ($(OH323STAT),1)
--		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/$(LIBPT_BASE).a))
-+		LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/$(LIBPT_BASE).a))
- 	else
--		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/$(LIBPT_BASE).so))
-+		LIBPTPATH=$(word 1,$(shell ls $(SYSLIBDIR)/$(LIBPT_BASE).so))
- 	endif
- 	LIBPTNAME=$(subst lib,,$(basename $(notdir $(LIBPTPATH))))
- endif
-@@ -59,42 +59,42 @@
- ifndef SKIP_SUFFIX
- 	ifeq ($(OH323STAT),1)
- 		ifeq ($(OH323BUILDTYPE),debug)   # Static, debug
--			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_d_s.a))
-+			LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*_d_s.a))
- 		else
- 			ifeq ($(OH323BUILDTYPE),opt) # Static, opt
--				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_r_s.a))
-+				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*_r_s.a))
- 			else                         # Static, opt, no trace
--				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*_n_s.a))
-+				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*_n_s.a))
- 			endif
- 		endif
- 	else
- 		ifeq ($(OH323BUILDTYPE),debug)   # Shared, debug
--			LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*d.so))
-+			LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*d.so))
- 		else
- 			ifeq ($(OH323BUILDTYPE),opt) # Shared, opt
--				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*r.so))
-+				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*r.so))
- 			else                         # Shared, opt, no trace
--				LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/libh323*n.so))
-+				LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/libh323*n.so))
- 			endif
- 		endif
- 	endif
- 	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
- else
- 	ifeq ($(OH323STAT),1)
--		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/$(LIBH323_BASE).a))
-+		LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/$(LIBH323_BASE).a))
- 	else
--		LIBH323PATH=$(word 1,$(shell ls $(OPENH323DIR)/lib/$(LIBH323_BASE).so))
-+		LIBH323PATH=$(word 1,$(shell ls $(SYSLIBDIR)/$(LIBH323_BASE).so))
- 	endif
- 	LIBH323NAME=$(subst lib,,$(basename $(notdir $(LIBH323PATH))))
- endif
- LIBH323=$(LIBH323NAME)
- 
- ifndef SKIP_EXTLIBS
--	EXTLIBS=$(shell $(PWLIBDIR)/make/ptlib-config --libs)
-+	EXTLIBS=$(shell $(PWLIBDIR)/make/ptlib-config --ldflags --libs)
- endif
- 
- CFLAGS += -pipe -Wstrict-prototypes -Wmissing-prototypes \
--		-Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -fPIC -g -O6 \
-+		-Wmissing-declarations -D_REENTRANT -D_GNU_SOURCE -fPIC -g \
- 		-fomit-frame-pointer -DAST_MODULE=\"chan_oh323.so\"
- 
- DRVDEPS=$(shell ls *.h)
-@@ -116,6 +116,7 @@
- 	if [ ! -d $(DESTDIR)$(ASTERISKETCDIR) ]; then \
- 		$(INSTALL) -d $(DESTDIR)$(ASTERISKETCDIR); \
- 	fi
-+	$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf ]; then \
- 		$(INSTALL) -m 0644 oh323.conf.sample $(DESTDIR)$(ASTERISKETCDIR)/oh323.conf; \
- 	fi
-@@ -151,19 +152,27 @@
- 	@if [ ! -f "$(LIBH323PATH)" ]; then \
- 		echo "ERROR: No OPENH323 library found!"; exit 1; \
- 	fi
-+ifeq ($(OH323NOWRAP),1)
-+	$(CC) -shared -Xlinker -x -g -o $@ $(TARGET_OBJ) \
-+	../wrapper/*.o \
-+	-L$(SYSLIBDIR) -l$(LIBH323) \
-+	-L$(SYSLIBDIR) -l$(LIBPT) \
-+	-lstdc++ $(EXTLIBS)
-+else
- ifeq ($(OH323STAT),1)
- 	$(CC) -shared -Xlinker -x -g -o $@ $(TARGET_OBJ) \
- 	-L../wrapper -loh323wrap_s \
--	-L$(OPENH323DIR)/lib -l$(LIBH323) \
--	-L$(PWLIBDIR)/lib -l$(LIBPT) \
-+	-L$(SYSLIBDIR) -l$(LIBH323) \
-+	-L$(SYSLIBDIR) -l$(LIBPT) \
- 	-lstdc++ $(EXTLIBS)
- else
- 	$(CC) -shared -Xlinker -x -g -o $@ $(TARGET_OBJ) \
- 	-L../wrapper -loh323wrap \
--	-L$(OPENH323DIR)/lib -l$(LIBH323) \
--	-L$(PWLIBDIR)/lib -l$(LIBPT) \
-+	-L$(SYSLIBDIR) -l$(LIBH323) \
-+	-L$(SYSLIBDIR) -l$(LIBPT) \
- 	-lstdc++ $(EXTLIBS)
- endif
-+endif
- 
- %.o: %.c $(DRVDEPS)
- 	$(CC) $(CFLAGS) $(ASTERISKINCLUDE) -c -o $@ $<
diff --git a/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c b/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c
deleted file mode 100644
index 58f0a863a327..000000000000
--- a/net/asterisk-oh323/files/patch-asterisk-driver::chan_oh323.c
+++ /dev/null
@@ -1,94 +0,0 @@
-
-$FreeBSD$
-
---- asterisk-driver/chan_oh323.c.orig
-+++ asterisk-driver/chan_oh323.c
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -43,6 +44,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <math.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <sys/signal.h>
- 
-@@ -83,6 +85,8 @@
- #include "asterisk/threadstorage.h"
- #include "asterisk/translate.h"
- 
-+#define CRASH abort()
-+
- #include "wrapper.hxx"
- #include "oh323.h"
- 
-@@ -954,8 +958,8 @@
- static void oh323_format2codecset(int, int *, int);
- static int context_from_alias(char *, char **);
- static int context_from_prefix(char *, char **);
--static int oh323_release(void *);
--static int oh323_exec_request(void *data);
-+static int oh323_release(const void *);
-+static int oh323_exec_request(const void *data);
- static struct oh323_ep *find_oh323_ep(char *epname, char *host, char *user);
- void oh323_atexit(void);
- unsigned int generate_uid(void);
-@@ -1595,6 +1599,8 @@
- 			ast_log(LOG_DEBUG, "%s: Call progress.\n", c->name);
- 		p->fr.frametype = AST_FRAME_CONTROL;
- 		p->fr.subclass = AST_CONTROL_PROGRESS;
-+/* The code below is broken with asterisk 1.4.23.1 */
-+#if 0
- 	/* -- Call transfer */
- 	} else if (e->type == OH323EXC_CALL_TRANSFER) {
- 		/* XXX Asterisk MUST read first the frame returned by this exception
-@@ -1608,6 +1614,7 @@
- 			memcpy(c->dtmfq, e->data, strlen(e->data));
- 			write(p->event_pipe[1], notify_buf, 1);
- 		}
-+#endif
- 	/* -- Call establishment notification */
- 	} else if (e->type == OH323EXC_CALL_ESTABLISHED) {
- 		memset(p->rtp.local_addr, 0, sizeof(p->rtp.local_addr));
-@@ -4110,7 +4117,7 @@
- /******************************************************************************/
- /* Monitoring thread and queue call-back functions ****************************/
- 
--static int oh323_exec_request(void *data)
-+static int oh323_exec_request(const void *data)
- {
- 	struct request_oh323 *e;
- 	int res, i;
-@@ -4217,7 +4224,7 @@
- 	return(0);
- }
- 
--static int oh323_release(void *data)
-+static int oh323_release(const void *data)
- {
- 	struct chan_oh323_pvt *pvt = (struct chan_oh323_pvt *)data;
- 	int index;
-@@ -4240,7 +4247,7 @@
- 	return(0);
- }
- 
--static int oh323_gk_check(void *data)
-+static int oh323_gk_check(const void *data)
- {
- 	char gkname[256];
- 
-@@ -4443,7 +4450,7 @@
- 				return(-1);
- 			}
- 		}
--		monitor_thread = -2;
-+		monitor_thread = AST_PTHREADT_STOP;
- 	} else {
- 		ast_log(LOG_WARNING, "Unable to lock the monitor.\n");
- 		return(-1);
diff --git a/net/asterisk-oh323/files/patch-rules.mak b/net/asterisk-oh323/files/patch-rules.mak
deleted file mode 100644
index 01f6a470fd15..000000000000
--- a/net/asterisk-oh323/files/patch-rules.mak
+++ /dev/null
@@ -1,51 +0,0 @@
-
-$FreeBSD$
-
---- rules.mak.orig
-+++ rules.mak
-@@ -42,9 +42,9 @@
- SUBDIRS = wrapper asterisk-driver
- .PHONY: all build install clean subdirs_build subdir_install subdir_clean \
- 		rpm rpm_clean help $(SUBDIRS)
--CC = gcc
--CPP = g++
--MAKE = make
-+CC ?= gcc
-+CPP ?= g++
-+MAKE ?= make
- INSTALL = install
- TOUCH = touch
- AR = ar
-@@ -63,8 +63,8 @@
- 
- # Set the C++ compiler flags (for wrapper compilation)
- # and C compiler flags (for channel driver compilation)
--CPPFLAGS = -Wall -felide-constructors -x c++ -Os
--CFLAGS = -Wall
-+CPPFLAGS += $(CXXFLAGS) -Wall -felide-constructors -x c++
-+CFLAGS += -Wall
- ifeq	($(OH323BUILDTYPE),optnotrace)
- OPENH323USERFLAGS := NOTRACE=1
- endif
-@@ -78,9 +78,9 @@
- CFLAGS += -DUSE_OLD_CAPABILITIES_API=1
- endif
- 
--ifneq	($(PROC),)
--CFLAGS += -march=$(PROC)
--endif
-+#ifneq	($(PROC))
-+#CFLAGS += -march=$(PROC)
-+#endif
- 
- ifdef	HAS_OH323MODS
- CPPFLAGS += -DHAS_OH323MODS
-@@ -108,7 +108,7 @@
-  
- clean: subdirs_clean rpm_clean
- 
--all: subdirs_build subdirs_strip subdirs_install
-+all: subdirs_build subdirs_strip
- 
- subdirs_build:
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x build || exit 1 ; done
diff --git a/net/asterisk-oh323/files/patch-wrapper::Makefile b/net/asterisk-oh323/files/patch-wrapper::Makefile
deleted file mode 100644
index aa053eb28a87..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
---- wrapper/Makefile.orig	Thu Mar 20 16:49:39 2008
-+++ wrapper/Makefile	Fri Mar 21 11:56:29 2008
-@@ -33,7 +33,7 @@
- .PHONY: .pwlib_version .openh323_version
- 
- OPENH323USERFLAGS =
--STDCCFLAGS :=
-+STDCCFLAGS := -fPIC
- 
- ifdef	NOVIDEO
- OPENH323USERFLAGS += NOVIDEO=1
-@@ -62,7 +62,7 @@
- ifdef	OH323_SUPPRESS_H235
- STDCCFLAGS  += -DOH323_SUPPRESS_H235
- endif
--OPENH323FLAGS = $(shell make $(OPENH323USERFLAGS) -f openh323flags.mak \
-+OPENH323FLAGS := $(shell $(MAKE) $(OPENH323USERFLAGS) -f openh323flags.mak \
- 		--no-print-directory -s \
- 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) oh323ccflags)
- CPPFLAGS += $(OPENH323FLAGS)
-@@ -100,25 +100,29 @@
- 	@if [ "$(OPENH323_VERSION)" = "UNKNOWN" ]; then \
- 		echo "*** Cannot determine the version of OPENH323!"; exit 1; \
- 	fi
-+ifneq ($(OH323NOWRAP),1)
- ifeq ($(OH323STAT),1)
- 	$(AR) rc liboh323wrap_s.a $(WRAPOBJECTS)
- else
--	$(CC) -shared -Wl,-soname,liboh323wrap.so -o liboh323wrap.so $(WRAPOBJECTS)
-+	$(CC) -shared -Wl,-soname,liboh323wrap.so.1 -o liboh323wrap.so.1 $(WRAPOBJECTS)
-+	ln -sfh liboh323wrap.so.1 liboh323wrap.so
-+endif
- endif
- 
- strip:
- 
- install:
-+ifneq ($(OH323NOWRAP),1)
- 	if [ ! -d $(DESTDIR)$(OH323WRAPLIBDIR) ]; then \
--		$(INSTALL) -d $(DESTDIR)$(OH323WRAPLIBDIR); \
-+		$(MKDIR) $(DESTDIR)$(OH323WRAPLIBDIR); \
- 	fi
- ifeq ($(OH323STAT),1)
--	$(INSTALL) -m 0644 liboh323wrap_s.a $(DESTDIR)$(OH323WRAPLIBDIR)
-+	$(BSD_INSTALL_PROGRAM) liboh323wrap_s.a $(DESTDIR)$(OH323WRAPLIBDIR)
- else
--	$(INSTALL) liboh323wrap.so $(DESTDIR)$(OH323WRAPLIBDIR)
--	cd $(DESTDIR)$(OH323WRAPLIBDIR); rm -f ./liboh323wrap.so.1; rm -f ./liboh323wrap.so.1.1
--	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so liboh323wrap.so.1
--	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so liboh323wrap.so.1.1
-+	$(BSD_INSTALL_PROGRAM) liboh323wrap.so.1 $(DESTDIR)$(OH323WRAPLIBDIR)
-+	cd $(DESTDIR)$(OH323WRAPLIBDIR); rm -f ./liboh323wrap.so
-+	cd $(DESTDIR)$(OH323WRAPLIBDIR); ln -s liboh323wrap.so.1 liboh323wrap.so
-+endif
- endif
- 
- clean:
diff --git a/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx b/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx
deleted file mode 100644
index ae87418a4bd0..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::asteriskaudio.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- wrapper/asteriskaudio.cxx.orig	2008-03-20 17:26:57.000000000 +0200
-+++ wrapper/asteriskaudio.cxx	2008-03-20 17:30:38.000000000 +0200
-@@ -29,6 +29,7 @@
-  */
- 
- #include <ptlib.h>
-+#include <ptlib/sound.h>
- #include <sys/time.h>
- #include <rtp.h>
- 
diff --git a/net/asterisk-oh323/files/patch-wrapper::check_ver b/net/asterisk-oh323/files/patch-wrapper::check_ver
deleted file mode 100644
index 90d14a6c4391..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::check_ver
+++ /dev/null
@@ -1,27 +0,0 @@
---- wrapper/check_ver.orig	Thu Apr 13 14:02:00 2006
-+++ wrapper/check_ver	Thu Apr 13 14:11:54 2006
-@@ -1,10 +1,17 @@
- #!/bin/sh
- 
--if [ -f .$2_version ]; then
--	mv .$2_version .$2_version.old
-+if [ -f .${2}_version ]; then
-+	mv .${2}_version .${2}_version.old
- fi
--
--MAJOR_VER=`cat $1/version.h | grep "#define MAJOR_VERSION" | awk -F\  '{print $3}'`
--MINOR_VER=`cat $1/version.h | grep "#define MINOR_VERSION" | awk -F\  '{print $3}'`
--BUILD_NUM=`cat $1/version.h | grep "#define BUILD_NUMBER" | awk -F\  '{print $3}'`
--echo -e "$MAJOR_VER.$MINOR_VER.$BUILD_NUM" > .$2_version
-+case ${2} in
-+	pwlib)
-+	grep "PWLIB_VERSION" ${1}/../../include/ptbuildopts.h | \
-+	  awk -F\  '{print $3}' > .${2}_version
-+	;;
-+	openh323)
-+	grep "OPENH323_VERSION" ${1}/../../include/${2}/${2}buildopts.h | \
-+	  awk -F\  '{print $3}' > .${2}_version
-+	;;
-+	*)
-+	;;
-+esac
diff --git a/net/asterisk-oh323/files/patch-wrapper::openh323flags.mak b/net/asterisk-oh323/files/patch-wrapper::openh323flags.mak
deleted file mode 100644
index 0915466c8ea8..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::openh323flags.mak
+++ /dev/null
@@ -1,12 +0,0 @@
---- wrapper/openh323flags.mak.orig	2008-03-20 16:49:39.000000000 +0200
-+++ wrapper/openh323flags.mak	2008-05-16 11:18:00.000000000 +0300
-@@ -1,6 +1,9 @@
- 
- include $(OPENH323DIR)/openh323u.mak
- 
-+obj_r/*.dep:
-+	@true # suppress implicit rule
-+
- oh323ccflags:
- 	@echo $(STDCCFLAGS)
- 
diff --git a/net/asterisk-oh323/files/patch-wrapper::wrapconnection.cxx b/net/asterisk-oh323/files/patch-wrapper::wrapconnection.cxx
deleted file mode 100644
index 1ca4df6a7625..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::wrapconnection.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- wrapper/wrapconnection.cxx.orig	2008-03-20 17:31:59.000000000 +0200
-+++ wrapper/wrapconnection.cxx	2008-03-20 17:32:19.000000000 +0200
-@@ -30,6 +30,7 @@
- /************************************************************************/
- 
- #include <ptlib.h>
-+#include <ptlib/sound.h>
- #include <h323.h>
- #include <h323pdu.h>
- #include <mediafmt.h>
diff --git a/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx b/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx
deleted file mode 100644
index da2254da834c..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::wrapendpoint.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- wrapper/wrapendpoint.cxx.orig	2008-03-20 17:33:42.000000000 +0200
-+++ wrapper/wrapendpoint.cxx	2008-03-20 17:33:54.000000000 +0200
-@@ -30,6 +30,7 @@
- /************************************************************************/
- 
- #include <ptlib.h>
-+#include <ptlib/sound.h>
- #include <h323.h>
- #include <h323pdu.h>
- #include <mediafmt.h>
diff --git a/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx b/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx
deleted file mode 100644
index 39ff0e86dcfa..000000000000
--- a/net/asterisk-oh323/files/patch-wrapper::wrapper.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- wrapper/wrapper.cxx.orig	2008-03-20 17:35:37.000000000 +0200
-+++ wrapper/wrapper.cxx	2008-03-20 17:35:50.000000000 +0200
-@@ -31,6 +31,7 @@
- /* INCLUDE FILES ********************************************************/
- 
- #include <ptlib.h>
-+#include <ptlib/sound.h>
- #include <h323.h>
- #include <h323pdu.h>
- #include <mediafmt.h>
diff --git a/net/asterisk-oh323/pkg-descr b/net/asterisk-oh323/pkg-descr
deleted file mode 100644
index 4613d0e43137..000000000000
--- a/net/asterisk-oh323/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Alternative implementation of H.323 protocol support for Asterisk PBX.
-
-WWW: http://www.inaccessnetworks.com/ian/projects/asterisk-oh323/
diff --git a/net/asterisk-oh323/pkg-message b/net/asterisk-oh323/pkg-message
deleted file mode 100644
index 3e89d18ed561..000000000000
--- a/net/asterisk-oh323/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-
-*********************************************
-*                                           *
-* Do not forget to disable loading          *
-* the chan_h323 module as it will most      *
-* likely prevent the Asterisk from working! *
-*                                           *
-*********************************************
-
diff --git a/net/asterisk-oh323/pkg-plist b/net/asterisk-oh323/pkg-plist
deleted file mode 100644
index 4593300c7d01..000000000000
--- a/net/asterisk-oh323/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/oh323.conf %D/etc/asterisk/oh323.conf.sample; then rm -f %D/etc/asterisk/oh323.conf; fi
-etc/asterisk/oh323.conf.sample
-@exec [ -f %B/oh323.conf ] || cp %B/%f %B/oh323.conf
-lib/asterisk/modules/chan_oh323.so
-lib/liboh323wrap.so
-lib/liboh323wrap.so.1
diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile
deleted file mode 100644
index 8674732dcfad..000000000000
--- a/net/asterisk14-addons/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:	asterisk-addons
-# Date created:				23 March 2006
-# Whom:					Fabian Gast <fgast@only640k.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk14
-PORTVERSION=	1.4.9
-PORTREVISION=	5
-CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
-		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
-PKGNAMESUFFIX=	-addons
-DISTNAME=	asterisk${PKGNAMESUFFIX}-${DISTVERSION}
-
-MAINTAINER=	pneumann@gmail.com
-COMMENT=	GPL modules for the Asterisk Open Source PBX
-
-DEPRECATED=	Depends on net/asterisk14, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
-BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14
-RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk14
-
-OPTIONS=	SAMPLE_CONFIG	"Install sample configuration files" off
-
-ONLY_FOR_ARCHS=	i386 amd64 powerpc
-USE_AUTOTOOLS=	libtool
-USE_MYSQL=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SAMPLE_CONFIG)
-PLIST_SUB+=	SAMPLE_CONFIG=""
-.else
-PLIST_SUB+=	SAMPLE_CONFIG="@comment "
-.endif
-
-pre-configure:
-	if ${GREP} -sq fixup_codecs ${LOCALBASE}/include/asterisk/channel.h; \
-	then \
-		${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/codecnego.diff; \
-	fi
-
-post-install:
-.if defined(WITH_SAMPLE_CONFIG)
-	@cd ${WRKSRC} && ${GMAKE} samples
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk14-addons/distinfo b/net/asterisk14-addons/distinfo
deleted file mode 100644
index 693bef719ac0..000000000000
--- a/net/asterisk14-addons/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (asterisk-addons-1.4.9.tar.gz) = 3d7bbcbbc074b58fcd81b8398b5c68c927ab2dca542b85fbac666ecc8bda11f0
-SIZE (asterisk-addons-1.4.9.tar.gz) = 806132
diff --git a/net/asterisk14-addons/files/codecnego.diff b/net/asterisk14-addons/files/codecnego.diff
deleted file mode 100644
index 0cfe569b41ea..000000000000
--- a/net/asterisk14-addons/files/codecnego.diff
+++ /dev/null
@@ -1,215 +0,0 @@
---- channels/chan_ooh323.c.orig	2007-07-21 15:17:52.000000000 +0800
-+++ channels/chan_ooh323.c	2008-02-13 15:37:17.000000000 +0800
-@@ -42,8 +42,8 @@
- 
- 
- /* Channel Definition */
--static struct ast_channel *ooh323_request(const char *type, int format, 
--                                        void *data, int *cause);
-+static struct ast_channel *ooh323_request(const char *type, const struct ast_codec_pref *format, void *data, int *cause);
-+
- static int ooh323_digit_begin(struct ast_channel *ast, char digit);
- static int ooh323_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
- static int ooh323_call(struct ast_channel *ast, char *dest, int timeout);
-@@ -57,8 +57,7 @@
- 
- static enum ast_rtp_get_result ooh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
- static enum ast_rtp_get_result ooh323_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
--static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, 
--                             struct ast_rtp *vrtp, int codecs, int nat_active);
-+static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, const struct ast_codec_pref *codecs, int nat_active);
- 
- static void print_codec_to_cli(int fd, struct ast_codec_pref *pref);
- static void ast_ooh323c_exit();
-@@ -244,6 +243,7 @@
- {
-    struct ast_channel *ch = NULL;
-    int fmt;
-+   int cap;
-    if(gH323Debug)
-       ast_log(LOG_DEBUG, "---   ooh323_new - %s\n", host);
- 
-@@ -258,10 +258,11 @@
-       ast_mutex_lock(&ch->lock);
-       ch->tech = &ooh323_tech;
- 
--      ch->nativeformats = i->capability;
--
-+      ast_codec_pref_init(&ch->nativeformats);
-+      ast_codec_pref_append_missing2(&ch->nativeformats, i->capability);
- 
--      fmt = ast_best_codec(ch->nativeformats);
-+      cap = ast_codec_pref_bits(&ch->nativeformats);
-+      fmt = ast_best_codec(cap);
- 
-       ch->fds[0] = ast_rtp_fd(i->rtp);
-       ch->fds[1] = ast_rtcp_fd(i->rtp);
-@@ -451,8 +452,7 @@
- /*
-    Possible data values - peername, exten/peername, exten@ip
-  */
--static struct ast_channel *ooh323_request(const char *type, int format, 
--                                        void *data, int *cause)
-+static struct ast_channel *ooh323_request(const char *type, const struct ast_codec_pref *formats, void *data, int *cause)
- 
- {
-    struct ast_channel *chan=NULL;
-@@ -461,22 +461,11 @@
-    char *dest = NULL; 
-    char *ext = NULL;
-    char tmp[256];
--   char formats[512];
--   int oldformat;
-    char *sport = NULL;
-    int port = 0;
- 
-    if(gH323Debug)
--      ast_verbose("---   ooh323_request - data %s format %s\n", (char*)data,  
--                              ast_getformatname_multiple(formats,512,format) );
--
--   oldformat = format;
--   format &= ((AST_FORMAT_MAX_AUDIO << 1) - 1);
--   if (!format) {
--      ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format "
--                          "'%d'\n", format);
--      return NULL;
--   }
-+      ast_verbose("---   ooh323_request - data %s format %s\n", (char*)data, ast_codec_pref_dump(tmp, sizeof(tmp), formats) );
- 
-    p = ooh323_alloc(0,0); /* Initial callRef is zero */
- 
-@@ -536,8 +525,8 @@
-       if(ext)
-          strncpy(p->exten, ext, sizeof(p->exten)-1);
- 
--      if(peer->capability & format)
--         p->capability = peer->capability & format;
-+      if(peer->capability & formats->audio_bits)
-+         p->capability = peer->capability & formats->audio_bits;
-       else{
-          p->capability = peer->capability;
-       }
-@@ -971,11 +960,11 @@
- 
-    if(f->frametype == AST_FRAME_VOICE)
-    {
--      if(!(f->subclass & ast->nativeformats))
-+      if(!(f->subclass & ast->nativeformats.audio_bits))
-       {
-          ast_log(LOG_WARNING, "Asked to transmit frame type %d, while native "
-                              "formats is %d (read/write = %d/%d)\n",
--                           f->subclass, ast->nativeformats, ast->readformat,
-+                           f->subclass, ast->nativeformats.audio_bits, ast->readformat,
-                               ast->writeformat);
-          return 0;
-       }
-@@ -2219,12 +2208,12 @@
- 	int x, codec;
- 
- 	for(x = 0; x < 32 ; x++) {
--		codec = ast_codec_pref_index(pref, x);
-+		codec = ast_codec_pref_index_audio(pref, x);
- 		if (!codec)
- 			break;
- 		ast_cli(fd, "%s", ast_getformatname(codec));
--		ast_cli(fd, ":%d", pref->framing[x]);
--		if (x < 31 && ast_codec_pref_index(pref, x + 1))
-+		ast_cli(fd, ":%d", pref->audio_framing[x]);
-+		if (x < 31 && ast_codec_pref_index_audio(pref, x + 1))
- 			ast_cli(fd, ",");
- 		}
- 	if (!x)
-@@ -3020,13 +3009,13 @@
-    (ooCallData *call, struct ast_codec_pref *prefs)
- {
-    int i=0;
--   int codec = ast_codec_pref_index(prefs, i);
-+   int codec = ast_codec_pref_index_audio(prefs, i);
- 
-    ooResetCapPrefs(call);
-    while(codec)
-    {
-       ooAppendCapToCapPrefs(call, ooh323_convertAsteriskCapToH323Cap(codec));
--      codec = ast_codec_pref_index(prefs, ++i);
-+      codec = ast_codec_pref_index_audio(prefs, ++i);
-    }
- 
-    return 0;
-@@ -3058,7 +3047,7 @@
- 
- static int ooh323_set_rtp_peer
-    (struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, 
--    int codecs, int nat_active)
-+    const struct ast_codec_pref *codecs, int nat_active)
- {
-    /* XXX Deal with Video */
-    struct ooh323_pvt *p;
-@@ -3106,7 +3095,7 @@
-    strncpy(mediaInfo.lMediaIP, ast_inet_ntoa(us.sin_addr), sizeof(mediaInfo.lMediaIP)-1);
-    mediaInfo.lMediaPort = ntohs(us.sin_port);
-    mediaInfo.lMediaCntrlPort = mediaInfo.lMediaPort +1;
--   for(x=0; 0 != (format=ast_codec_pref_index(&p->prefs, x)); x++)
-+   for(x=0; 0 != (format=ast_codec_pref_index_audio(&p->prefs, x)); x++)
-    {
-       strcpy(mediaInfo.dir, "transmit");
-       mediaInfo.cap = ooh323_convertAsteriskCapToH323Cap(format);
-@@ -3250,10 +3239,11 @@
-       /* We already hold the channel lock */
-       if (f->frametype == AST_FRAME_VOICE) 
-       {
--         if (f->subclass != p->owner->nativeformats) 
-+         if (!(f->subclass & p->owner->nativeformats.audio_bits))
-          {
-             ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
--            p->owner->nativeformats = f->subclass;
-+            ast_codec_pref_append(&p->owner->nativeformats, f->subclass);
-+            p->capability |= f->subclass;
-             ast_set_read_format(p->owner, p->owner->readformat);
-             ast_set_write_format(p->owner, p->owner->writeformat);
-          }
---- channels/ooh323cDriver.c.orig	2007-01-20 06:27:05.000000000 +0800
-+++ channels/ooh323cDriver.c	2008-02-11 16:47:24.000000000 +0800
-@@ -66,7 +66,7 @@
-    if(gH323Debug)
-      ast_verbose("\tAdding capabilities to H323 endpoint\n");
-    
--   for(x=0; 0 != (format=ast_codec_pref_index(prefs, x)); x++)
-+   for(x=0; 0 != (format=ast_codec_pref_index_audio(prefs, x)); x++)
-    {
-       if(format & AST_FORMAT_ULAW)
-       {
-@@ -172,14 +172,14 @@
-       ret |= ooCallEnableDTMFH245Signal(call);
- 
- 
--   for(x=0; 0 !=(format=ast_codec_pref_index(prefs, x)); x++)
-+   for(x=0; 0 !=(format=ast_codec_pref_index_audio(prefs, x)); x++)
-    {
-       if(format & AST_FORMAT_ULAW)
-       {
-          if(gH323Debug)
-             ast_verbose("\tAdding g711 ulaw capability to call(%s, %s)\n", 
-                                               call->callType, call->callToken);
--	 txframes = prefs->framing[x];
-+	 txframes = prefs->audio_framing[x];
-          ret= ooCallAddG711Capability(call, OO_G711ULAW64K, txframes, 
-                                       grxframes, OORXANDTX, 
-                                       &ooh323c_start_receive_channel,
-@@ -192,7 +192,7 @@
-          if(gH323Debug)
-             ast_verbose("\tAdding g711 alaw capability to call(%s, %s)\n",
-                                             call->callType, call->callToken);
--         txframes = prefs->framing[x];
-+         txframes = prefs->audio_framing[x];
-          ret= ooCallAddG711Capability(call, OO_G711ALAW64K, txframes, 
-                                      grxframes, OORXANDTX, 
-                                      &ooh323c_start_receive_channel,
-@@ -206,7 +206,7 @@
-          if(gH323Debug)
-             ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
-                                             call->callType, call->callToken);
--         txframes = (prefs->framing[x])/10;
-+         txframes = (prefs->audio_framing[x])/10;
-          ret= ooCallAddG729Capability(call, OO_G729A, txframes, 24, 
-                                      OORXANDTX, &ooh323c_start_receive_channel,
-                                      &ooh323c_start_transmit_channel,
diff --git a/net/asterisk14-addons/files/patch-Makefile b/net/asterisk14-addons/files/patch-Makefile
deleted file mode 100644
index 4bcc7f4e3115..000000000000
--- a/net/asterisk14-addons/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Feb 14 00:58:11 2008
-+++ Makefile	Fri Feb 22 19:17:58 2008
-@@ -27,7 +27,7 @@
- # Overwite config files on "make samples"
- OVERWRITE:=y
- 
--ASTCFLAGS+=-fPIC
-+ASTCFLAGS+=-fPIC -I${PREFIX}/include
- 
- #NOISY_BUILD=yes
- 
diff --git a/net/asterisk14-addons/pkg-descr b/net/asterisk14-addons/pkg-descr
deleted file mode 100644
index d2454dbd184f..000000000000
--- a/net/asterisk14-addons/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package contains additional modules for the  Asterisk Open Source PBX
-which are, not included in the normal base distribution, becouse of licence
-incompatilities.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk14-addons/pkg-plist b/net/asterisk14-addons/pkg-plist
deleted file mode 100644
index eec5dd3eca6e..000000000000
--- a/net/asterisk14-addons/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-lib/asterisk/modules/app_addon_sql_mysql.so
-lib/asterisk/modules/app_saycountpl.so
-lib/asterisk/modules/cdr_addon_mysql.so
-lib/asterisk/modules/res_config_mysql.so
-lib/asterisk/modules/format_mp3.so
-lib/asterisk/modules/chan_ooh323.so
-%%SAMPLE_CONFIG%%etc/asterisk/cdr_mysql.conf
-%%SAMPLE_CONFIG%%etc/asterisk/res_mysql.conf
-%%SAMPLE_CONFIG%%etc/asterisk/ooh323.conf
-%%SAMPLE_CONFIG%%etc/asterisk/mysql.conf
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
deleted file mode 100644
index b3411e12b3e7..000000000000
--- a/net/asterisk14/Makefile
+++ /dev/null
@@ -1,206 +0,0 @@
-# New ports collection makefile for:	asterisk
-# Date created:				17 October 2003
-# Whom:					Maxim Sobolev <sobomax@portaone.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asterisk
-PORTVERSION=	1.4.37
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
-		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
-PKGNAMESUFFIX=	14
-
-MAINTAINER=	sobomax@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
-
-FORBIDDEN=	Vulnerable since 2011-06-25, http://portaudit.freebsd.org/40544e8c-9f7b-11e0-9bec-6c626dd55a41.html
-EXPIRATION_DATE=	2011-10-14
-
-BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
-		newt.52:${PORTSDIR}/devel/newt \
-		gsm.1:${PORTSDIR}/audio/gsm \
-		curl.6:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-
-ONLY_FOR_ARCHS=	i386 sparc64 amd64 powerpc
-
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
-USE_GMAKE=	yes
-USE_BISON=	build
-USE_RC_SUBR=	asterisk.sh
-MAKE_ENV=	MKDIR="${MKDIR}" \
-		PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
-		ASTCFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}" \
-		ASTLDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
-CONFLICTS=	asterisk*-1.2* asterisk*-1.6* asterisk*-1.8*
-
-OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
-		ODBC		"Enable ODBC support" on \
-		POSTGRES	"Enable PostgreSQL support" on \
-		RADIUS		"Enable RADIUS accounting support" on \
-		SNMP		"Enable SNMP support" on \
-		H323		"Enable H.323 support" on \
-		FREETDS		"Enable FreeTDS support" on \
-		JABBER		"Enable Jabber and Gtalk support" on \
-		SQLITE          "Enable SQLITE support" on \
-		CODEC_PATCH	"Apply codec negotiation patch" off \
-		ILBC		"Enable iLBC codec" off \
-		MISC_PATCHES	"Apply additional patches" off
-
-.include <bsd.port.pre.mk>
-
-.if ${PREFIX} == ${LOCALBASE}
-CONFIGURE_ARGS+=--localstatedir=/var
-.endif
-
-.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-OPTIONS+=	DAHDI		"Enable DAHDI support" on
-
-# Include this since we have altered OPTIONS.
-.include <bsd.port.options.mk>
-.endif
-
-.if !defined(WITH_H323)
-PLIST_SUB+=	WITH_H323="@comment "
-CONFIGURE_ARGS+= --without-h323
-.else
-PLIST_SUB+=	WITH_H323=""
-CONFIGURE_ARGS+= --with-h323=${LOCALBASE}
-LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib \
-		h323_r.1:${PORTSDIR}/net/openh323
-.endif
-
-.if !defined(WITH_DAHDI)
-PLIST_SUB+=	WITH_DAHDI="@comment "
-CONFIGURE_ARGS+=	--without-dahdi
-.else
-PLIST_SUB+=	WITH_DAHDI=""
-CONFIGURE_ARGS+=	--with-dahdi
-BUILD_DEPENDS+=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
-		${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
-.endif
-
-#
-# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
-# similarly
-.if !defined(WITH_ODBC)
-PLIST_SUB+=	WITH_ODBC="@comment "
-CONFIGURE_ARGS+= --without-odbc
-.else
-PLIST_SUB+=	WITH_ODBC=""
-CONFIGURE_ARGS+= --with-odbc --with-ltdl
-USE_AUTOTOOLS+=	libltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
-.endif
-
-.if !defined(WITH_FREETDS)
-PLIST_SUB+=	WITH_FREETDS="@comment "
-CONFIGURE_ARGS+= --without-tds
-.else
-PLIST_SUB+=	WITH_FREETDS=""
-CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
-LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
-.endif
-
-.if !defined(WITH_POSTGRES)
-PLIST_SUB+=	WITH_POSTGRES="@comment "
-CONFIGURE_ARGS+= --without-postgres
-.else
-PLIST_SUB+=	WITH_POSTGRES=""
-USE_PGSQL=	yes
-CONFIGURE_ARGS+= --with-postgres
-.endif
-
-.if !defined(WITH_OGGVORBIS)
-PLIST_SUB+=	WITH_OGGVORBIS="@comment "
-CONFIGURE_ARGS+= --without-ogg
-.else
-PLIST_SUB+=	WITH_OGGVORBIS=""
-CONFIGURE_ARGS+= --with-ogg
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-.endif
-
-.if !defined(WITH_RADIUS)
-PLIST_SUB+=	WITH_RADIUS="@comment "
-CONFIGURE_ARGS+= --without-radius
-.else
-PLIST_SUB+=	WITH_RADIUS=""
-CONFIGURE_ARGS+= --with-radius
-LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
-.endif
-
-.if !defined(WITH_SNMP)
-PLIST_SUB+=	WITH_SNMP="@comment "
-CONFIGURE_ARGS+= --without-netsnmp
-.else
-PLIST_SUB+=	WITH_SNMP=""
-CONFIGURE_ARGS+= --with-netsnmp
-LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-
-.if !defined(WITH_JABBER)
-PLIST_SUB+=	WITH_JABBER="@comment "
-CONFIGURE_ARGS+= --without-iksemel
-.else
-PLIST_SUB+=	WITH_JABBER=""
-CONFIGURE_ARGS+= --with-iksemel
-LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
-.endif
-
-.if !defined(WITH_SQLITE)
-PLIST_SUB+=	WITH_SQLITE="@comment "
-CONFIGURE_ARGS+=	--without-sqlite
-.else
-PLIST_SUB+=	WITH_SQLITE=""
-CONFIGURE_ARGS+= --with-sqlite
-LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2
-.endif
-
-.if !defined(WITH_ILBC)
-PLIST_SUB+=	WITH_ILBC="@comment "
-.else
-PLIST_SUB+=	WITH_ILBC=""
-EXTRA_PATCHES+=	${PATCHDIR}/ilbc_enable.diff
-.endif
-
-.if defined(WITH_CODEC_PATCH)
-PATCHFILES=	asterisk-1.4.37-codec-negotiation-20101130.diff.gz
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	fjoe/
-EXTRA_PATCHES+=	${PATCHDIR}/codecnego-patch-Makefile
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/nocodecnego-patch-Makefile
-.endif
-
-.if defined(WITH_MISC_PATCHES)
-EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
-EXTRA_PATCHES+=	${PATCHDIR}/sip_force_callid.diff
-EXTRA_PATCHES+=	${PATCHDIR}/sip_set_auth.diff
-.if defined(WITH_CODEC_PATCH)
-EXTRA_PATCHES+=	${PATCHDIR}/rtp_force_dtmf-codecnego.diff
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff
-.endif
-.endif
-
-post-extract:
-	${MKDIR} ${WRKSRC}/codecs/ilbc
-	${FIND} ${WRKSRC} -name '*.d' -delete
-
-post-patch:
-	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo
deleted file mode 100644
index 6028ee866140..000000000000
--- a/net/asterisk14/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (asterisk-1.4.37.tar.gz) = 0168cc552eb5c3758a447d22c6d08a8cba0509b0be4036e253f895066facf3f6
-SIZE (asterisk-1.4.37.tar.gz) = 21666828
-SHA256 (asterisk-1.4.37-codec-negotiation-20101130.diff.gz) = fa1acd617b9648e5e7b5d4da4691eded88834d93957f113ac8ddf94f9307200c
-SIZE (asterisk-1.4.37-codec-negotiation-20101130.diff.gz) = 40520
diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.sh.in
deleted file mode 100644
index ca5941068460..000000000000
--- a/net/asterisk14/files/asterisk.sh.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: asterisk
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable asterisk:
-#
-# asterisk_enable="YES"
-#
-
-. /etc/rc.subr
-
-stop_precmd=asterisk_shutdown
-sig_stop=KILL
-asterisk_shutdown () {
-  %%PREFIX%%/sbin/asterisk -qrx 'stop now'
-  sleep 1
-  return 0
-}
-
-name=asterisk
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/asterisk
-
-load_rc_config $name
-
-pidfile=${asterisk_pidfile:-"/var/run/asterisk.pid"}
-
-asterisk_enable=${asterisk_enable:-"NO"}
-
-run_rc_command "$1"
diff --git a/net/asterisk14/files/codecnego-patch-Makefile b/net/asterisk14/files/codecnego-patch-Makefile
deleted file mode 100644
index e39dd6f62082..000000000000
--- a/net/asterisk14/files/codecnego-patch-Makefile
+++ /dev/null
@@ -1,219 +0,0 @@
---- Makefile.orig	2009-11-20 17:48:05.000000000 +0200
-+++ Makefile	2009-11-20 17:50:33.000000000 +0200
-@@ -101,7 +101,7 @@
- OVERWRITE=y
- 
- # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g3
-+#DEBUG=-g3
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -135,7 +135,7 @@
-   ASTMANDIR=$(mandir)
- ifneq ($(findstring BSD,$(OSARCH)),)
-   ASTVARLIBDIR=$(prefix)/share/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-+  ASTVARRUNDIR=$(localstatedir)/run
- else
-   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- endif
-@@ -225,9 +225,11 @@
-   _ASTLDFLAGS+=-L/usr/local/lib
- endif
- 
-+ifneq ($(OSARCH),FreeBSD)
- ifneq ($(PROC),ultrasparc)
-   _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- endif
-+endif
- 
- ifeq ($(PROC),ppc)
-   _ASTCFLAGS+=-fsigned-char
-@@ -235,7 +237,7 @@
- 
- ifeq ($(OSARCH),FreeBSD)
-   # -V is understood by BSD Make, not by GNU make.
--  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+  BSDVERSION=$(OSVERSION)
-   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- endif
-@@ -416,15 +418,15 @@
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail?  There are portions here that *could* be customized but might also be
- # improved a lot.  I'll put it here for now.
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
- 	for x in static-http/*; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 	$(MAKE) -C sounds install
- 
- update: 
-@@ -445,47 +447,47 @@
- OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
- 
- installdirs:
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
- 
- bininstall: _all installdirs $(SUBDIRS_INSTALL)
--	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
- 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
--	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
--	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
--		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
-+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
-+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- 	fi
--	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
--	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
--	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	if [ -n "$(OLDHEADERS)" ]; then \
- 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- 	fi
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
--	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
-+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
--		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
- 	fi
- 
- $(SUBDIRS_INSTALL):
-@@ -521,7 +523,7 @@
- 	@exit 1
- endif
- 
--install: badshell datafiles bininstall
-+install: badshell datafiles bininstall samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi
-@@ -559,31 +561,23 @@
- upgrade: bininstall
- 
- adsi:
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
- 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
--			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
- 		fi ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
- 	done
- 
- samples: adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
--			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
--					echo "Config file $$x is unchanged"; \
--					continue; \
--				fi ; \
--				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
--			else \
--				echo "Skipping config file $$x"; \
--				continue; \
--			fi ;\
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
-+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
- 		fi ; \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
- 	done
--	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+	if true; then \
- 		( \
- 		echo "[directories]" ; \
- 		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -670,20 +664,23 @@
- 		echo "; Default: strict"; \
- 		echo ";"; \
- 		echo ";translation_algorithm = strict"; \
--		) > $(DESTDIR)$(ASTCONFPATH) ; \
-+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
-+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+			cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
-+		fi; \
- 	else \
- 		echo "Skipping asterisk.conf creation"; \
- 	fi
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
- 
- webvmail:
- 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
- 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- 	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
--	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
-+	$(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- 	for x in images/*.gif; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
- 	done
- 	@echo " +--------- Asterisk Web Voicemail ----------+"  
- 	@echo " +                                           +"
diff --git a/net/asterisk14/files/dtmf_debug.diff b/net/asterisk14/files/dtmf_debug.diff
deleted file mode 100644
index d360744d10e6..000000000000
--- a/net/asterisk14/files/dtmf_debug.diff
+++ /dev/null
@@ -1,221 +0,0 @@
---- channels/chan_sip.c.orig	2009-05-12 21:18:44.000000000 +0300
-+++ channels/chan_sip.c	2009-05-26 12:50:22.000000000 +0300
-@@ -3891,6 +3891,7 @@
- 		ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
- 	else {
- 		p->owner = newchan;
-+		ast_rtp_set_chan_name(p->rtp, newchan->name);
- 		/* Re-invite RTP back to Asterisk. Needed if channel is masqueraded out of a native
- 		   RTP bridge (i.e., RTP not going through Asterisk): RTP bridge code might not be
- 		   able to do this if the masquerade happens before the bridge breaks (e.g., AMI
-@@ -4168,6 +4169,7 @@
- 	if (i->rtp) {
- 		tmp->fds[0] = ast_rtp_fd(i->rtp);
- 		tmp->fds[1] = ast_rtcp_fd(i->rtp);
-+		ast_rtp_set_chan_id(i->rtp, i->callid);
- 	}
- 	if (needvideo && i->vrtp) {
- 		tmp->fds[2] = ast_rtp_fd(i->vrtp);
-@@ -4195,6 +4197,8 @@
- 	if (!ast_strlen_zero(i->language))
- 		ast_string_field_set(tmp, language, i->language);
- 	i->owner = tmp;
-+	ast_rtp_set_chan_name(i->rtp, tmp->name);
-+
- 	ast_module_ref(ast_module_info->self);
- 	ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
- 	/*Since it is valid to have extensions in the dialplan that have unescaped characters in them
-@@ -4621,8 +4625,10 @@
- 	build_via(p);
- 	if (!callid)
- 		build_callid_pvt(p);
--	else
-+	else {
- 		ast_string_field_set(p, callid, callid);
-+		ast_rtp_set_chan_id(p->rtp, p->callid);
-+	}
- 	/* Assign default music on hold class */
- 	ast_string_field_set(p, mohinterpret, default_mohinterpret);
- 	ast_string_field_set(p, mohsuggest, default_mohsuggest);
---- include/asterisk/rtp.h.orig	2008-03-04 20:05:28.000000000 +0200
-+++ include/asterisk/rtp.h	2009-05-26 12:50:22.000000000 +0300
-@@ -243,6 +243,9 @@
- 
- int ast_rtp_codec_getformat(int pt);
- 
-+void ast_rtp_set_chan_name(struct ast_rtp *, const char *);
-+void ast_rtp_set_chan_id(struct ast_rtp *, const char *);
-+
- /*! \brief Set rtp timeout */
- void ast_rtp_set_rtptimeout(struct ast_rtp *rtp, int timeout);
- /*! \brief Set rtp hold timeout */
---- main/rtp.c.orig	2009-11-20 17:51:49.000000000 +0200
-+++ main/rtp.c	2009-11-20 17:53:11.000000000 +0200
-@@ -81,6 +81,7 @@
- static int rtpstart;			/*!< First port for RTP sessions (set in rtp.conf) */
- static int rtpend;			/*!< Last port for RTP sessions (set in rtp.conf) */
- static int rtpdebug;			/*!< Are we debugging? */
-+static int rtpdebugdtmf;		/*!< Are we debugging DTMFs? */
- static int rtcpdebug;			/*!< Are we debugging RTCP? */
- static int rtcpstats;			/*!< Are we debugging RTCP? */
- static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */
-@@ -170,6 +171,8 @@
- 	struct ast_codec_pref pref;
- 	struct ast_rtp *bridged;        /*!< Who we are Packet bridged to */
- 	int set_marker_bit:1;           /*!< Whether to set the marker bit or not */
-+        char chan_name[100];
-+        char chan_id[100];
- };
- 
- /* Forward declarations */
-@@ -676,8 +679,8 @@
- 	struct ast_frame *f = NULL;
- 	event = ntohl(*((unsigned int *)(data)));
- 	event &= 0x001F;
--	if (option_debug > 2 || rtpdebug)
--		ast_log(LOG_DEBUG, "Cisco DTMF Digit: %08x (len = %d)\n", event, len);
-+	if (option_debug > 2 || rtpdebug || rtpdebugdtmf)
-+		ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF packet: %08x (len = %d)\n", rtp->chan_name, rtp->chan_id, event, len);
- 	if (event < 10) {
- 		resp = '0' + event;
- 	} else if (event < 11) {
-@@ -691,12 +694,25 @@
- 	}
- 	if (rtp->resp && (rtp->resp != resp)) {
- 		f = create_dtmf_frame(rtp, AST_FRAME_DTMF_END);
-+                ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF event: %c\n", rtp->chan_name, rtp->chan_id, rtp->resp);
- 	}
- 	rtp->resp = resp;
- 	rtp->dtmf_timeout = 0;
- 	return f;
- }
- 
-+void ast_rtp_set_chan_id(struct ast_rtp *rtp, const char *chan_id) {
-+        if (rtp == NULL || chan_id == NULL)
-+                return;
-+        snprintf(rtp->chan_id, sizeof(rtp->chan_id), "%s", chan_id);
-+}
-+
-+void ast_rtp_set_chan_name(struct ast_rtp *rtp, const char *chan_name) {
-+        if (rtp == NULL || chan_name == NULL)
-+                return;
-+        snprintf(rtp->chan_name, sizeof(rtp->chan_name), "%s", chan_name);
-+}
-+
- /*! 
-  * \brief Process RTP DTMF and events according to RFC 2833.
-  * 
-@@ -1101,6 +1117,10 @@
- 	struct rtpPayloadType rtpPT;
- 	int reconstruct = ntohl(rtpheader[0]);
- 
-+	/* If we are listening for DTMF - then feed all packets into the core  to keep the RTP stream consistent when relaying DTMFs */
-+	if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF))
-+		return -1;
-+
- 	/* Get fields from packet */
- 	payload = (reconstruct & 0x7f0000) >> 16;
- 	mark = (((reconstruct & 0x800000) >> 23) != 0);
-@@ -1108,10 +1128,6 @@
- 	/* Check what the payload value should be */
- 	rtpPT = ast_rtp_lookup_pt(rtp, payload);
- 
--	/* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */
--	if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF)
--		return -1;
--
- 	/* Otherwise adjust bridged payload to match */
- 	bridged_payload = ast_rtp_lookup_code(bridged, rtpPT.isAstFormat, rtpPT.code);
- 
-@@ -1306,11 +1322,12 @@
- 		/* This is special in-band data that's not one of our codecs */
- 		if (rtpPT.code == AST_RTP_DTMF) {
- 			/* It's special -- rfc2833 process it */
--			if (rtp_debug_test_addr(&sin)) {
-+			if (rtp_debug_test_addr(&sin) || rtpdebugdtmf) {
- 				unsigned char *data;
- 				unsigned int event;
- 				unsigned int event_end;
- 				unsigned int duration;
-+
- 				data = rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen;
- 				event = ntohl(*((unsigned int *)(data)));
- 				event >>= 24;
-@@ -1319,7 +1336,7 @@
- 				event_end >>= 24;
- 				duration = ntohl(*((unsigned int *)(data)));
- 				duration &= 0xFFFF;
--				ast_verbose("Got  RTP RFC2833 from   %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
-+				ast_verbose("Channel: %s %s Got RTP RFC2833 from %s:%u to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d)\n", rtp->chan_name, rtp->chan_id, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), ast_inet_ntoa(rtp->us.sin_addr), ntohs(rtp->us.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
- 			}
- 			/* process_rfc2833 may need to return multiple frames. We do this
- 			 * by passing the pointer to the frame list to it so that the method
-@@ -2287,8 +2307,9 @@
- 			ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n",
- 				ast_inet_ntoa(rtp->them.sin_addr),
- 				ntohs(rtp->them.sin_port), strerror(errno));
--		if (rtp_debug_test_addr(&rtp->them))
--			ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
-+		if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf)
-+			ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
-+				    rtp->chan_name, rtp->chan_id,
- 				    ast_inet_ntoa(rtp->them.sin_addr),
- 				    ntohs(rtp->them.sin_port), payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
- 		/* Increment sequence number */
-@@ -2331,8 +2352,9 @@
- 		ast_log(LOG_ERROR, "RTP Transmission error to %s:%d: %s\n",
- 			ast_inet_ntoa(rtp->them.sin_addr),
- 			ntohs(rtp->them.sin_port), strerror(errno));
--	if (rtp_debug_test_addr(&rtp->them))
--		ast_verbose("Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
-+	if (rtp_debug_test_addr(&rtp->them) || rtpdebugdtmf)
-+		ast_verbose("Channel: %s %s Sent RTP DTMF packet to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n",
-+			    rtp->chan_name, rtp->chan_id,
- 			    ast_inet_ntoa(rtp->them.sin_addr),
- 			    ntohs(rtp->them.sin_port), rtp->send_payload, rtp->seqno, rtp->lastdigitts, res - hdrlen);
- 
-@@ -3621,6 +3643,16 @@
- 	return RESULT_SUCCESS;
- }
- 
-+static int rtp_do_debug_dtmf(int fd, int argc, char *argv[])
-+{
-+	if (argc != 3)
-+		return RESULT_SHOWUSAGE;
-+
-+	rtpdebugdtmf = 1;
-+	ast_cli(fd, "RTP DTMF debugging enabled\n");
-+	return RESULT_SUCCESS;
-+}
-+
- static int rtp_do_debug(int fd, int argc, char *argv[])
- {
- 	if (argc != 2) {
-@@ -3681,6 +3713,7 @@
- 	if (argc != 3)
- 		return RESULT_SHOWUSAGE;
- 	rtpdebug = 0;
-+	rtpdebugdtmf = 0;
- 	ast_cli(fd,"RTP Debugging Disabled\n");
- 	return RESULT_SUCCESS;
- }
-@@ -3741,7 +3774,7 @@
- }
- 
- static char debug_usage[] =
--  "Usage: rtp debug [ip host[:port]]\n"
-+  "Usage: rtp debug [ip host[:port] | dtmf]\n"
-   "       Enable dumping of all RTP packets to and from host.\n";
- 
- static char no_debug_usage[] =
-@@ -3816,6 +3849,10 @@
- 	rtp_do_debug, "Enable RTP debugging",
- 	debug_usage },
- 
-+	{ { "rtp", "debug", "dtmf", NULL },
-+	rtp_do_debug_dtmf, "Enable RTP debugging on DTMFs",
-+	debug_usage },
-+
- 	{ { "rtp", "debug", "off", NULL },
- 	rtp_no_debug, "Disable RTP debugging",
- 	no_debug_usage, NULL, &cli_rtp_no_debug_deprecated },
diff --git a/net/asterisk14/files/ilbc_enable.diff b/net/asterisk14/files/ilbc_enable.diff
deleted file mode 100644
index a2a3c4f73d70..000000000000
--- a/net/asterisk14/files/ilbc_enable.diff
+++ /dev/null
@@ -1,7599 +0,0 @@
-
-$FreeBSD$
-
---- menuselect-tree
-+++ menuselect-tree
-@@ -269,7 +269,6 @@
- 	<depend>gsm</depend>
- </member>
- <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
- </member>
-diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c
---- codecs/ilbc.orig/FrameClassify.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/FrameClassify.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,110 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    FrameClassify.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "iLBC_define.h"
-+#include "FrameClassify.h"
-+
-+/*---------------------------------------------------------------*
-+ *  Classification of subframes to localize start state
-+ *--------------------------------------------------------------*/
-+
-+int FrameClassify(      /* index to the max-energy sub-frame */
-+    iLBC_Enc_Inst_t *iLBCenc_inst, 
-+                        /* (i/o) the encoder state structure */
-+    float *residual     /* (i) lpc residual signal */
-+) {
-+    float max_ssqEn, fssqEn[NSUB_MAX], bssqEn[NSUB_MAX], *pp;
-+    int n, l, max_ssqEn_n;
-+    const float ssqEn_win[NSUB_MAX-1]={(float)0.8,(float)0.9,
-+        (float)1.0,(float)0.9,(float)0.8};
-+    const float sampEn_win[5]={(float)1.0/(float)6.0, 
-+        (float)2.0/(float)6.0, (float)3.0/(float)6.0,
-+        (float)4.0/(float)6.0, (float)5.0/(float)6.0};
-+    
-+    /* init the front and back energies to zero */
-+
-+    memset(fssqEn, 0, NSUB_MAX*sizeof(float));
-+    memset(bssqEn, 0, NSUB_MAX*sizeof(float));
-+
-+    /* Calculate front of first seqence */
-+
-+    n=0;
-+    pp=residual;
-+
-+
-+    for (l=0; l<5; l++) {
-+        fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-+        pp++;
-+    }
-+    for (l=5; l<SUBL; l++) {
-+        fssqEn[n] += (*pp) * (*pp);
-+        pp++;
-+    }
-+
-+    /* Calculate front and back of all middle sequences */
-+
-+    for (n=1; n<iLBCenc_inst->nsub-1; n++) {
-+        pp=residual+n*SUBL;
-+        for (l=0; l<5; l++) {
-+            fssqEn[n] += sampEn_win[l] * (*pp) * (*pp);
-+            bssqEn[n] += (*pp) * (*pp);
-+            pp++;
-+        }
-+        for (l=5; l<SUBL-5; l++) {
-+            fssqEn[n] += (*pp) * (*pp);
-+            bssqEn[n] += (*pp) * (*pp);
-+            pp++;
-+        }
-+        for (l=SUBL-5; l<SUBL; l++) {
-+            fssqEn[n] += (*pp) * (*pp);
-+            bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-+            pp++;
-+        }
-+    }
-+
-+    /* Calculate back of last seqence */
-+
-+    n=iLBCenc_inst->nsub-1;
-+    pp=residual+n*SUBL;
-+    for (l=0; l<SUBL-5; l++) {
-+        bssqEn[n] += (*pp) * (*pp);
-+        pp++;
-+    }
-+    for (l=SUBL-5; l<SUBL; l++) {
-+        bssqEn[n] += sampEn_win[SUBL-l-1] * (*pp) * (*pp);
-+        pp++;
-+    }
-+
-+    /* find the index to the weighted 80 sample with 
-+       most energy */
-+
-+    if (iLBCenc_inst->mode==20) l=1;
-+    else                        l=0;
-+
-+    max_ssqEn=(fssqEn[0]+bssqEn[1])*ssqEn_win[l];
-+    max_ssqEn_n=1;
-+    for (n=2; n<iLBCenc_inst->nsub; n++) {
-+
-+        l++;
-+
-+
-+        if ((fssqEn[n-1]+bssqEn[n])*ssqEn_win[l] > max_ssqEn) {
-+            max_ssqEn=(fssqEn[n-1]+bssqEn[n]) *
-+                            ssqEn_win[l];
-+            max_ssqEn_n=n;
-+        }
-+    }
-+
-+    return max_ssqEn_n;
-+}
-+
-+
-diff -druN codecs/ilbc.orig/FrameClassify.h codecs/ilbc/FrameClassify.h
---- codecs/ilbc.orig/FrameClassify.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/FrameClassify.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,26 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    FrameClassify.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+
-+
-+#ifndef __iLBC_FRAMECLASSIFY_H
-+#define __iLBC_FRAMECLASSIFY_H
-+
-+int FrameClassify(      /* index to the max-energy sub-frame */
-+    iLBC_Enc_Inst_t *iLBCenc_inst, 
-+                        /* (i/o) the encoder state structure */
-+    float *residual     /* (i) lpc residual signal */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/LPCdecode.c codecs/ilbc/LPCdecode.c
---- codecs/ilbc.orig/LPCdecode.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/LPCdecode.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,152 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    LPC_decode.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <string.h>
-+
-+#include "helpfun.h"
-+#include "lsf.h"
-+#include "iLBC_define.h"
-+#include "LPCdecode.h"
-+#include "constants.h"
-+
-+/*---------------------------------------------------------------*
-+ *  interpolation of lsf coefficients for the decoder
-+ *--------------------------------------------------------------*/
-+
-+void LSFinterpolate2a_dec( 
-+    float *a,           /* (o) lpc coefficients for a sub-frame */
-+    float *lsf1,    /* (i) first lsf coefficient vector */
-+
-+
-+    float *lsf2,    /* (i) second lsf coefficient vector */
-+    float coef,         /* (i) interpolation weight */
-+    int length          /* (i) length of lsf vectors */
-+){
-+    float  lsftmp[LPC_FILTERORDER];
-+    
-+    interpolate(lsftmp, lsf1, lsf2, coef, length);
-+    lsf2a(a, lsftmp);
-+}
-+
-+/*---------------------------------------------------------------*
-+ *  obtain dequantized lsf coefficients from quantization index 
-+ *--------------------------------------------------------------*/
-+
-+void SimplelsfDEQ(
-+    float *lsfdeq,    /* (o) dequantized lsf coefficients */
-+    int *index,         /* (i) quantization index */
-+    int lpc_n           /* (i) number of LPCs */
-+){  
-+    int i, j, pos, cb_pos;
-+
-+    /* decode first LSF */
-+    
-+    pos = 0;
-+    cb_pos = 0;
-+    for (i = 0; i < LSF_NSPLIT; i++) {
-+        for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-+            lsfdeq[pos + j] = lsfCbTbl[cb_pos + 
-+                (long)(index[i])*dim_lsfCbTbl[i] + j];
-+        }       
-+        pos += dim_lsfCbTbl[i];
-+        cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-+    }
-+
-+    if (lpc_n>1) {
-+
-+        /* decode last LSF */
-+
-+        pos = 0;
-+        cb_pos = 0;
-+        for (i = 0; i < LSF_NSPLIT; i++) {
-+            for (j = 0; j < dim_lsfCbTbl[i]; j++) {
-+                lsfdeq[LPC_FILTERORDER + pos + j] = 
-+                    lsfCbTbl[cb_pos + 
-+                    (long)(index[LSF_NSPLIT + i])*
-+                    dim_lsfCbTbl[i] + j];
-+            }       
-+            pos += dim_lsfCbTbl[i];
-+            cb_pos += size_lsfCbTbl[i]*dim_lsfCbTbl[i];
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+
-+
-+ *  obtain synthesis and weighting filters form lsf coefficients 
-+ *---------------------------------------------------------------*/
-+
-+void DecoderInterpolateLSF( 
-+    float *syntdenum, /* (o) synthesis filter coefficients */
-+    float *weightdenum, /* (o) weighting denumerator 
-+                               coefficients */
-+    float *lsfdeq,       /* (i) dequantized lsf coefficients */
-+    int length,         /* (i) length of lsf coefficient vector */
-+    iLBC_Dec_Inst_t *iLBCdec_inst 
-+                        /* (i) the decoder state structure */
-+){
-+    int    i, pos, lp_length;
-+    float  lp[LPC_FILTERORDER + 1], *lsfdeq2;
-+        
-+    lsfdeq2 = lsfdeq + length;
-+    lp_length = length + 1;
-+    
-+    if (iLBCdec_inst->mode==30) {
-+        /* sub-frame 1: Interpolation between old and first */
-+
-+        LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, lsfdeq, 
-+            lsf_weightTbl_30ms[0], length);
-+        memcpy(syntdenum,lp,lp_length*sizeof(float));
-+        bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, 
-+            lp_length);
-+
-+        /* sub-frames 2 to 6: interpolation between first 
-+           and last LSF */
-+    
-+        pos = lp_length;
-+        for (i = 1; i < 6; i++) {
-+            LSFinterpolate2a_dec(lp, lsfdeq, lsfdeq2, 
-+                lsf_weightTbl_30ms[i], length);
-+            memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-+            bwexpand(weightdenum + pos, lp, 
-+                LPC_CHIRP_WEIGHTDENUM, lp_length);
-+            pos += lp_length;
-+        }
-+    }
-+    else {
-+        pos = 0;
-+        for (i = 0; i < iLBCdec_inst->nsub; i++) {
-+            LSFinterpolate2a_dec(lp, iLBCdec_inst->lsfdeqold, 
-+                lsfdeq, lsf_weightTbl_20ms[i], length);
-+            memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-+            bwexpand(weightdenum+pos, lp, LPC_CHIRP_WEIGHTDENUM, 
-+                lp_length);
-+            pos += lp_length;
-+        }
-+    }
-+    
-+    /* update memory */
-+
-+
-+
-+    if (iLBCdec_inst->mode==30)
-+        memcpy(iLBCdec_inst->lsfdeqold, lsfdeq2, 
-+                    length*sizeof(float));
-+    else
-+        memcpy(iLBCdec_inst->lsfdeqold, lsfdeq, 
-+                    length*sizeof(float));
-+
-+}
-+
-+
-diff -druN codecs/ilbc.orig/LPCdecode.h codecs/ilbc/LPCdecode.h
---- codecs/ilbc.orig/LPCdecode.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/LPCdecode.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,44 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    LPC_decode.h     
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_LPC_DECODE_H
-+#define __iLBC_LPC_DECODE_H
-+
-+void LSFinterpolate2a_dec( 
-+
-+
-+    float *a,           /* (o) lpc coefficients for a sub-frame */
-+    float *lsf1,    /* (i) first lsf coefficient vector */
-+    float *lsf2,    /* (i) second lsf coefficient vector */
-+    float coef,         /* (i) interpolation weight */
-+    int length          /* (i) length of lsf vectors */
-+);
-+      
-+void SimplelsfDEQ( 
-+    float *lsfdeq,      /* (o) dequantized lsf coefficients */
-+    int *index,         /* (i) quantization index */
-+    int lpc_n           /* (i) number of LPCs */
-+);
-+
-+void DecoderInterpolateLSF( 
-+    float *syntdenum,   /* (o) synthesis filter coefficients */
-+    float *weightdenum, /* (o) weighting denumerator 
-+                               coefficients */
-+    float *lsfdeq,      /* (i) dequantized lsf coefficients */
-+    int length,         /* (i) length of lsf coefficient vector */
-+    iLBC_Dec_Inst_t *iLBCdec_inst 
-+                        /* (i) the decoder state structure */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/LPCencode.c codecs/ilbc/LPCencode.c
---- codecs/ilbc.orig/LPCencode.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/LPCencode.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,228 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    LPCencode.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <string.h>
-+
-+
-+
-+#include "iLBC_define.h"
-+#include "LPCencode.h"
-+#include "helpfun.h"
-+#include "lsf.h"
-+#include "constants.h"
-+
-+/*----------------------------------------------------------------*
-+ *  lpc analysis (subrutine to LPCencode)
-+ *---------------------------------------------------------------*/
-+
-+static void SimpleAnalysis(
-+    float *lsf,         /* (o) lsf coefficients */
-+    float *data,    /* (i) new data vector */
-+    iLBC_Enc_Inst_t *iLBCenc_inst 
-+                        /* (i/o) the encoder state structure */
-+){
-+    int k, is;
-+    float temp[BLOCKL_MAX], lp[LPC_FILTERORDER + 1];
-+    float lp2[LPC_FILTERORDER + 1];
-+    float r[LPC_FILTERORDER + 1];
-+
-+    is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-+    memcpy(iLBCenc_inst->lpc_buffer+is,data,
-+        iLBCenc_inst->blockl*sizeof(float));
-+    
-+    /* No lookahead, last window is asymmetric */
-+    
-+    for (k = 0; k < iLBCenc_inst->lpc_n; k++) {
-+        
-+        is = LPC_LOOKBACK;
-+
-+        if (k < (iLBCenc_inst->lpc_n - 1)) {
-+            window(temp, lpc_winTbl, 
-+                iLBCenc_inst->lpc_buffer, BLOCKL_MAX);
-+        } else {
-+            window(temp, lpc_asymwinTbl, 
-+                iLBCenc_inst->lpc_buffer + is, BLOCKL_MAX);
-+        }
-+        
-+        autocorr(r, temp, BLOCKL_MAX, LPC_FILTERORDER);
-+        window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
-+        
-+        levdurb(lp, temp, r, LPC_FILTERORDER);
-+        bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);
-+
-+        a2lsf(lsf + k*LPC_FILTERORDER, lp2);
-+    }
-+    is=LPC_LOOKBACK+BLOCKL_MAX-iLBCenc_inst->blockl;
-+    memmove(iLBCenc_inst->lpc_buffer, 
-+        iLBCenc_inst->lpc_buffer+LPC_LOOKBACK+BLOCKL_MAX-is, 
-+        is*sizeof(float));
-+}
-+
-+/*----------------------------------------------------------------*
-+
-+
-+ *  lsf interpolator and conversion from lsf to a coefficients
-+ *  (subrutine to SimpleInterpolateLSF)
-+ *---------------------------------------------------------------*/
-+
-+static void LSFinterpolate2a_enc(
-+    float *a,       /* (o) lpc coefficients */ 
-+    float *lsf1,/* (i) first set of lsf coefficients */
-+    float *lsf2,/* (i) second set of lsf coefficients */
-+    float coef,     /* (i) weighting coefficient to use between 
-+                           lsf1 and lsf2 */
-+    long length      /* (i) length of coefficient vectors */
-+){  
-+    float  lsftmp[LPC_FILTERORDER];
-+    
-+    interpolate(lsftmp, lsf1, lsf2, coef, length);
-+    lsf2a(a, lsftmp);
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  lsf interpolator (subrutine to LPCencode)
-+ *---------------------------------------------------------------*/
-+
-+static void SimpleInterpolateLSF(
-+    float *syntdenum,   /* (o) the synthesis filter denominator 
-+                               resulting from the quantized 
-+                               interpolated lsf */
-+    float *weightdenum, /* (o) the weighting filter denominator 
-+                               resulting from the unquantized 
-+                               interpolated lsf */
-+    float *lsf,         /* (i) the unquantized lsf coefficients */
-+    float *lsfdeq,      /* (i) the dequantized lsf coefficients */
-+    float *lsfold,      /* (i) the unquantized lsf coefficients of 
-+                               the previous signal frame */
-+    float *lsfdeqold, /* (i) the dequantized lsf coefficients of 
-+                               the previous signal frame */
-+    int length,         /* (i) should equate LPC_FILTERORDER */
-+    iLBC_Enc_Inst_t *iLBCenc_inst 
-+                        /* (i/o) the encoder state structure */
-+){
-+    int    i, pos, lp_length;
-+    float  lp[LPC_FILTERORDER + 1], *lsf2, *lsfdeq2;
-+    
-+    lsf2 = lsf + length;
-+    lsfdeq2 = lsfdeq + length;
-+    lp_length = length + 1; 
-+ 
-+    if (iLBCenc_inst->mode==30) {
-+        /* sub-frame 1: Interpolation between old and first 
-+           set of lsf coefficients */
-+
-+        LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, 
-+            lsf_weightTbl_30ms[0], length);
-+        memcpy(syntdenum,lp,lp_length*sizeof(float));
-+        LSFinterpolate2a_enc(lp, lsfold, lsf, 
-+
-+
-+            lsf_weightTbl_30ms[0], length);
-+        bwexpand(weightdenum, lp, LPC_CHIRP_WEIGHTDENUM, lp_length);
-+
-+        /* sub-frame 2 to 6: Interpolation between first 
-+           and second set of lsf coefficients */
-+    
-+        pos = lp_length;
-+        for (i = 1; i < iLBCenc_inst->nsub; i++) {
-+            LSFinterpolate2a_enc(lp, lsfdeq, lsfdeq2, 
-+                lsf_weightTbl_30ms[i], length);
-+            memcpy(syntdenum + pos,lp,lp_length*sizeof(float));
-+        
-+            LSFinterpolate2a_enc(lp, lsf, lsf2, 
-+                lsf_weightTbl_30ms[i], length);
-+            bwexpand(weightdenum + pos, lp, 
-+                LPC_CHIRP_WEIGHTDENUM, lp_length);
-+            pos += lp_length;
-+        }
-+    }
-+    else {
-+        pos = 0;
-+        for (i = 0; i < iLBCenc_inst->nsub; i++) {
-+            LSFinterpolate2a_enc(lp, lsfdeqold, lsfdeq, 
-+                lsf_weightTbl_20ms[i], length);
-+            memcpy(syntdenum+pos,lp,lp_length*sizeof(float));
-+            LSFinterpolate2a_enc(lp, lsfold, lsf, 
-+                lsf_weightTbl_20ms[i], length);
-+            bwexpand(weightdenum+pos, lp, 
-+                LPC_CHIRP_WEIGHTDENUM, lp_length);
-+            pos += lp_length;
-+        }
-+    }
-+    
-+    /* update memory */
-+
-+    if (iLBCenc_inst->mode==30) {
-+        memcpy(lsfold, lsf2, length*sizeof(float));
-+        memcpy(lsfdeqold, lsfdeq2, length*sizeof(float));
-+    }
-+    else {
-+        memcpy(lsfold, lsf, length*sizeof(float));
-+        memcpy(lsfdeqold, lsfdeq, length*sizeof(float));
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  lsf quantizer (subrutine to LPCencode)
-+ *---------------------------------------------------------------*/
-+
-+static void SimplelsfQ(
-+    float *lsfdeq,    /* (o) dequantized lsf coefficients
-+                           (dimension FILTERORDER) */
-+    int *index,     /* (o) quantization index */
-+    float *lsf,      /* (i) the lsf coefficient vector to be 
-+
-+
-+                           quantized (dimension FILTERORDER ) */
-+    int lpc_n     /* (i) number of lsf sets to quantize */
-+){    
-+    /* Quantize first LSF with memoryless split VQ */
-+    SplitVQ(lsfdeq, index, lsf, lsfCbTbl, LSF_NSPLIT, 
-+        dim_lsfCbTbl, size_lsfCbTbl);
-+
-+    if (lpc_n==2) {
-+        /* Quantize second LSF with memoryless split VQ */
-+        SplitVQ(lsfdeq + LPC_FILTERORDER, index + LSF_NSPLIT, 
-+            lsf + LPC_FILTERORDER, lsfCbTbl, LSF_NSPLIT, 
-+            dim_lsfCbTbl, size_lsfCbTbl);
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  lpc encoder
-+ *---------------------------------------------------------------*/
-+
-+void LPCencode( 
-+    float *syntdenum, /* (i/o) synthesis filter coefficients 
-+                               before/after encoding */
-+    float *weightdenum, /* (i/o) weighting denumerator 
-+                               coefficients before/after 
-+                               encoding */
-+    int *lsf_index,     /* (o) lsf quantization index */
-+    float *data,    /* (i) lsf coefficients to quantize */
-+    iLBC_Enc_Inst_t *iLBCenc_inst 
-+                        /* (i/o) the encoder state structure */
-+){
-+    float lsf[LPC_FILTERORDER * LPC_N_MAX];
-+    float lsfdeq[LPC_FILTERORDER * LPC_N_MAX];
-+    int change=0;
-+    
-+    SimpleAnalysis(lsf, data, iLBCenc_inst);
-+    SimplelsfQ(lsfdeq, lsf_index, lsf, iLBCenc_inst->lpc_n);
-+    change=LSF_check(lsfdeq, LPC_FILTERORDER, iLBCenc_inst->lpc_n);
-+    SimpleInterpolateLSF(syntdenum, weightdenum, 
-+        lsf, lsfdeq, iLBCenc_inst->lsfold, 
-+        iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst);
-+}
-+
-+
-+
-diff -druN codecs/ilbc.orig/LPCencode.h codecs/ilbc/LPCencode.h
---- codecs/ilbc.orig/LPCencode.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/LPCencode.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,29 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    LPCencode.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_LPCENCOD_H
-+#define __iLBC_LPCENCOD_H
-+
-+void LPCencode( 
-+    float *syntdenum,   /* (i/o) synthesis filter coefficients 
-+                               before/after encoding */
-+    float *weightdenum, /* (i/o) weighting denumerator coefficients
-+                               before/after encoding */
-+    int *lsf_index,     /* (o) lsf quantization index */
-+    float *data,    /* (i) lsf coefficients to quantize */
-+    iLBC_Enc_Inst_t *iLBCenc_inst 
-+                        /* (i/o) the encoder state structure */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/Makefile codecs/ilbc/Makefile
---- codecs/ilbc.orig/Makefile	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/Makefile	2007-10-29 15:12:16.000000000 -0700
-@@ -0,0 +1,20 @@
-+LIB=libilbc.a
-+CFLAGS+=-fPIC
-+
-+OBJS=anaFilter.o iCBSearch.o packing.o \
-+     constants.o gainquant.o iLBC_decode.o StateConstructW.o \
-+     createCB.o getCBvec.o iLBC_encode.o StateSearchW.o doCPLC.o \
-+     helpfun.o syntFilter.o enhancer.o hpInput.o LPCdecode.o \
-+     filter.o hpOutput.o LPCencode.o FrameClassify.o iCBConstruct.o lsf.o
-+
-+include $(ASTTOPDIR)/Makefile.rules
-+
-+all: $(LIB)
-+
-+$(LIB): $(OBJS)
-+	$(ECHO_PREFIX) echo "   [AR] $^ -> $@"
-+	$(CMD_PREFIX) $(AR) cr $@ $^
-+	$(CMD_PREFIX) $(RANLIB) $@
-+
-+clean:
-+	rm -f $(LIB) *.o .*.d *.s *.i
-diff -druN codecs/ilbc.orig/StateConstructW.c codecs/ilbc/StateConstructW.c
---- codecs/ilbc.orig/StateConstructW.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/StateConstructW.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,76 @@
-+
-+/******************************************************************
-+
-+
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    StateConstructW.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h> 
-+#include <string.h>
-+
-+#include "iLBC_define.h"
-+#include "StateConstructW.h"
-+#include "constants.h"
-+#include "filter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  decoding of the start state
-+ *---------------------------------------------------------------*/
-+
-+void StateConstructW( 
-+    int idxForMax,      /* (i) 6-bit index for the quantization of 
-+                               max amplitude */
-+    int *idxVec,    /* (i) vector of quantization indexes */
-+    float *syntDenum,   /* (i) synthesis filter denumerator */
-+    float *out,         /* (o) the decoded state vector */
-+    int len             /* (i) length of a state vector */
-+){
-+    float maxVal, tmpbuf[LPC_FILTERORDER+2*STATE_LEN], *tmp, 
-+        numerator[LPC_FILTERORDER+1];
-+    float foutbuf[LPC_FILTERORDER+2*STATE_LEN], *fout;
-+    int k,tmpi;
-+    
-+    /* decoding of the maximum value */
-+
-+    maxVal = state_frgqTbl[idxForMax];
-+    maxVal = (float)pow(10,maxVal)/(float)4.5;
-+        
-+    /* initialization of buffers and coefficients */
-+    
-+    memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-+    memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-+    for (k=0; k<LPC_FILTERORDER; k++) {
-+        numerator[k]=syntDenum[LPC_FILTERORDER-k];
-+    }
-+    numerator[LPC_FILTERORDER]=syntDenum[0];
-+    tmp = &tmpbuf[LPC_FILTERORDER];
-+    fout = &foutbuf[LPC_FILTERORDER];
-+
-+    /* decoding of the sample values */
-+    
-+    for (k=0; k<len; k++) {
-+        tmpi = len-1-k;
-+        /* maxVal = 1/scal */
-+
-+
-+        tmp[k] = maxVal*state_sq3Tbl[idxVec[tmpi]];
-+    }
-+
-+    /* circular convolution with all-pass filter */
-+
-+    memset(tmp+len, 0, len*sizeof(float));
-+    ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, 
-+        LPC_FILTERORDER, fout);
-+    for (k=0;k<len;k++) {
-+        out[k] = fout[len-1-k]+fout[2*len-1-k];
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/StateConstructW.h codecs/ilbc/StateConstructW.h
---- codecs/ilbc.orig/StateConstructW.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/StateConstructW.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,27 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    StateConstructW.h  
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_STATECONSTRUCTW_H
-+#define __iLBC_STATECONSTRUCTW_H
-+
-+void StateConstructW( 
-+    int idxForMax,      /* (i) 6-bit index for the quantization of 
-+                               max amplitude */
-+    int *idxVec,    /* (i) vector of quantization indexes */
-+    float *syntDenum,   /* (i) synthesis filter denumerator */
-+    float *out,         /* (o) the decoded state vector */
-+    int len             /* (i) length of a state vector */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/StateSearchW.c codecs/ilbc/StateSearchW.c
---- codecs/ilbc.orig/StateSearchW.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/StateSearchW.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,194 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    StateSearchW.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h> 
-+#include <string.h>
-+
-+#include "iLBC_define.h"
-+#include "StateSearchW.h"
-+#include "constants.h"
-+#include "filter.h"
-+#include "helpfun.h"
-+
-+/*----------------------------------------------------------------*
-+ *  predictive noise shaping encoding of scaled start state 
-+ *  (subrutine for StateSearchW) 
-+ *---------------------------------------------------------------*/
-+
-+void AbsQuantW(
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  
-+                        /* (i) Encoder instance */
-+    float *in,          /* (i) vector to encode */
-+    float *syntDenum,   /* (i) denominator of synthesis filter */
-+    float *weightDenum, /* (i) denominator of weighting filter */
-+    int *out,           /* (o) vector of quantizer indexes */
-+    int len,        /* (i) length of vector to encode and 
-+                               vector of quantizer indexes */
-+    int state_first     /* (i) position of start state in the 
-+                               80 vec */
-+){
-+    float *syntOut;
-+    float syntOutBuf[LPC_FILTERORDER+STATE_SHORT_LEN_30MS];
-+    float toQ, xq;
-+    int n;
-+    int index;
-+
-+    /* initialization of buffer for filtering */
-+            
-+    memset(syntOutBuf, 0, LPC_FILTERORDER*sizeof(float));
-+
-+
-+
-+    /* initialization of pointer for filtering */
-+
-+    syntOut = &syntOutBuf[LPC_FILTERORDER];
-+    
-+    /* synthesis and weighting filters on input */
-+    
-+    if (state_first) {
-+        AllPoleFilter (in, weightDenum, SUBL, LPC_FILTERORDER);
-+    } else {
-+        AllPoleFilter (in, weightDenum, 
-+            iLBCenc_inst->state_short_len-SUBL, 
-+            LPC_FILTERORDER);
-+    }
-+
-+    /* encoding loop */
-+
-+    for (n=0; n<len; n++) {
-+        
-+        /* time update of filter coefficients */  
-+        
-+        if ((state_first)&&(n==SUBL)){
-+            syntDenum += (LPC_FILTERORDER+1);
-+            weightDenum += (LPC_FILTERORDER+1);
-+
-+            /* synthesis and weighting filters on input */
-+            AllPoleFilter (&in[n], weightDenum, len-n, 
-+                LPC_FILTERORDER);
-+
-+        } else if ((state_first==0)&&
-+            (n==(iLBCenc_inst->state_short_len-SUBL))) {
-+            syntDenum += (LPC_FILTERORDER+1);
-+            weightDenum += (LPC_FILTERORDER+1);
-+
-+            /* synthesis and weighting filters on input */
-+            AllPoleFilter (&in[n], weightDenum, len-n, 
-+                LPC_FILTERORDER);
-+            
-+        }
-+        
-+        /* prediction of synthesized and weighted input */
-+
-+        syntOut[n] = 0.0;
-+        AllPoleFilter (&syntOut[n], weightDenum, 1, 
-+            LPC_FILTERORDER);
-+        
-+        /* quantization */      
-+
-+        toQ = in[n]-syntOut[n];
-+        sort_sq(&xq, &index, toQ, state_sq3Tbl, 8);
-+        out[n]=index;
-+        syntOut[n] = state_sq3Tbl[out[n]];
-+
-+        /* update of the prediction filter */
-+
-+
-+
-+        AllPoleFilter(&syntOut[n], weightDenum, 1, 
-+            LPC_FILTERORDER);
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  encoding of start state                          
-+ *---------------------------------------------------------------*/
-+
-+void StateSearchW( 
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  
-+                        /* (i) Encoder instance */
-+    float *residual,/* (i) target residual vector */
-+    float *syntDenum,   /* (i) lpc synthesis filter */
-+    float *weightDenum, /* (i) weighting filter denuminator */
-+    int *idxForMax,     /* (o) quantizer index for maximum 
-+                               amplitude */
-+    int *idxVec,    /* (o) vector of quantization indexes */
-+    int len,        /* (i) length of all vectors */
-+    int state_first     /* (i) position of start state in the 
-+                               80 vec */
-+){  
-+    float dtmp, maxVal;
-+    float tmpbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS];
-+    float *tmp, numerator[1+LPC_FILTERORDER]; 
-+    float foutbuf[LPC_FILTERORDER+2*STATE_SHORT_LEN_30MS], *fout;
-+    int k;
-+    float qmax, scal;
-+    
-+    /* initialization of buffers and filter coefficients */
-+
-+    memset(tmpbuf, 0, LPC_FILTERORDER*sizeof(float));
-+    memset(foutbuf, 0, LPC_FILTERORDER*sizeof(float));
-+    for (k=0; k<LPC_FILTERORDER; k++) {
-+        numerator[k]=syntDenum[LPC_FILTERORDER-k];
-+    }
-+    numerator[LPC_FILTERORDER]=syntDenum[0];
-+    tmp = &tmpbuf[LPC_FILTERORDER];
-+    fout = &foutbuf[LPC_FILTERORDER];
-+
-+    /* circular convolution with the all-pass filter */
-+    
-+    memcpy(tmp, residual, len*sizeof(float));
-+    memset(tmp+len, 0, len*sizeof(float));
-+    ZeroPoleFilter(tmp, numerator, syntDenum, 2*len, 
-+        LPC_FILTERORDER, fout);
-+    for (k=0; k<len; k++) {
-+        fout[k] += fout[k+len];
-+    }   
-+        
-+    /* identification of the maximum amplitude value */
-+    
-+    maxVal = fout[0];
-+
-+
-+    for (k=1; k<len; k++) {
-+        
-+        if (fout[k]*fout[k] > maxVal*maxVal){
-+            maxVal = fout[k];
-+        }
-+    }
-+    maxVal=(float)fabs(maxVal);
-+        
-+    /* encoding of the maximum amplitude value */
-+    
-+    if (maxVal < 10.0) {
-+        maxVal = 10.0;
-+    }
-+    maxVal = (float)log10(maxVal);
-+    sort_sq(&dtmp, idxForMax, maxVal, state_frgqTbl, 64);
-+
-+    /* decoding of the maximum amplitude representation value,
-+       and corresponding scaling of start state */
-+
-+    maxVal=state_frgqTbl[*idxForMax];
-+    qmax = (float)pow(10,maxVal);
-+    scal = (float)(4.5)/qmax;
-+    for (k=0; k<len; k++){
-+        fout[k] *= scal;
-+    }
-+
-+    /* predictive noise shaping encoding of scaled start state */
-+
-+    AbsQuantW(iLBCenc_inst, fout,syntDenum, 
-+        weightDenum,idxVec, len, state_first);
-+}
-+
-+
-diff -druN codecs/ilbc.orig/StateSearchW.h codecs/ilbc/StateSearchW.h
---- codecs/ilbc.orig/StateSearchW.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/StateSearchW.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,48 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    StateSearchW.h     
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_STATESEARCHW_H
-+#define __iLBC_STATESEARCHW_H
-+
-+void AbsQuantW(
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  
-+                        /* (i) Encoder instance */
-+    float *in,          /* (i) vector to encode */
-+    float *syntDenum,   /* (i) denominator of synthesis filter */
-+    float *weightDenum, /* (i) denominator of weighting filter */
-+    int *out,           /* (o) vector of quantizer indexes */
-+    int len,        /* (i) length of vector to encode and 
-+                               vector of quantizer indexes */
-+    int state_first     /* (i) position of start state in the 
-+                               80 vec */
-+);
-+
-+void StateSearchW( 
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  
-+                        /* (i) Encoder instance */
-+    float *residual,/* (i) target residual vector */
-+    float *syntDenum,   /* (i) lpc synthesis filter */
-+    float *weightDenum, /* (i) weighting filter denuminator */
-+    int *idxForMax,     /* (o) quantizer index for maximum 
-+                               amplitude */
-+    int *idxVec,    /* (o) vector of quantization indexes */
-+    int len,        /* (i) length of all vectors */
-+    int state_first     /* (i) position of start state in the 
-+
-+
-+                               80 vec */
-+);
-+
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/anaFilter.c codecs/ilbc/anaFilter.c
---- codecs/ilbc.orig/anaFilter.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/anaFilter.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,71 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    anaFilter.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <string.h>
-+#include "anaFilter.h"
-+#include "iLBC_define.h"
-+
-+/*----------------------------------------------------------------*
-+ *  LP analysis filter.
-+
-+
-+ *---------------------------------------------------------------*/
-+    
-+void anaFilter(
-+    float *In,  /* (i) Signal to be filtered */
-+    float *a,   /* (i) LP parameters */
-+    int len,/* (i) Length of signal */
-+    float *Out, /* (o) Filtered signal */
-+    float *mem  /* (i/o) Filter state */
-+){
-+    int i, j;
-+    float *po, *pi, *pm, *pa;
-+
-+    po = Out;
-+
-+    /* Filter first part using memory from past */
-+    
-+    for (i=0; i<LPC_FILTERORDER; i++) {
-+        pi = &In[i];
-+        pm = &mem[LPC_FILTERORDER-1];
-+        pa = a;
-+        *po=0.0;
-+        for (j=0; j<=i; j++) {
-+            *po+=(*pa++)*(*pi--);
-+        }
-+        for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-+
-+            *po+=(*pa++)*(*pm--);
-+        }
-+        po++;
-+    }
-+
-+    /* Filter last part where the state is entierly 
-+       in the input vector */
-+
-+    for (i=LPC_FILTERORDER; i<len; i++) {
-+        pi = &In[i];
-+        pa = a;
-+        *po=0.0;
-+        for (j=0; j<LPC_FILTERORDER+1; j++) {
-+            *po+=(*pa++)*(*pi--);
-+        }
-+        po++;
-+    }
-+
-+    /* Update state vector */
-+
-+    memcpy(mem, &In[len-LPC_FILTERORDER], 
-+        LPC_FILTERORDER*sizeof(float));
-+}
-+
-+
-diff -druN codecs/ilbc.orig/anaFilter.h codecs/ilbc/anaFilter.h
---- codecs/ilbc.orig/anaFilter.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/anaFilter.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,26 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    anaFilter.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_ANAFILTER_H
-+#define __iLBC_ANAFILTER_H
-+
-+void anaFilter(
-+    float *In,  /* (i) Signal to be filtered */
-+    float *a,   /* (i) LP parameters */
-+    int len,/* (i) Length of signal */
-+    float *Out, /* (o) Filtered signal */
-+    float *mem  /* (i/o) Filter state */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/constants.c codecs/ilbc/constants.c
---- codecs/ilbc.orig/constants.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/constants.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,729 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    constants.c
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "iLBC_define.h"
-+
-+/* ULP bit allocation */
-+
-+    /* 20 ms frame */
-+
-+const iLBC_ULP_Inst_t ULP_20msTbl = {
-+    /* LSF */
-+    {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, 
-+        {0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-+    /* Start state location, gain and samples */
-+    {2,0,0,0,0},
-+    {1,0,0,0,0},
-+    {6,0,0,0,0},
-+    {0,1,2,0,0},
-+    /* extra CB index and extra CB gain */
-+    {{6,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-+    {{2,0,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-+    /* CB index and CB gain */
-+    {   {{7,0,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-+        {{0,0,8,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-+        {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-+        {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}},
-+    {   {{1,2,2,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-+        {{1,1,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-+        {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}},
-+        {{0,0,0,0,0}, {0,0,0,0,0}, {0,0,0,0,0}}}
-+};
-+
-+    /* 30 ms frame */
-+
-+const iLBC_ULP_Inst_t ULP_30msTbl = {
-+    /* LSF */
-+    {   {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}, 
-+
-+
-+        {6,0,0,0,0}, {7,0,0,0,0}, {7,0,0,0,0}},
-+    /* Start state location, gain and samples */
-+    {3,0,0,0,0},
-+    {1,0,0,0,0},
-+    {6,0,0,0,0},
-+    {0,1,2,0,0},
-+    /* extra CB index and extra CB gain */
-+    {{4,2,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-+    {{1,1,3,0,0}, {1,1,2,0,0}, {0,0,3,0,0}},
-+    /* CB index and CB gain */
-+    {   {{6,1,1,0,0}, {0,0,7,0,0}, {0,0,7,0,0}},
-+        {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-+        {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}},
-+        {{0,7,1,0,0}, {0,0,8,0,0}, {0,0,8,0,0}}},
-+    {   {{1,2,2,0,0}, {1,2,1,0,0}, {0,0,3,0,0}},
-+        {{0,2,3,0,0}, {0,2,2,0,0}, {0,0,3,0,0}},
-+        {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}},
-+        {{0,1,4,0,0}, {0,1,3,0,0}, {0,0,3,0,0}}}
-+};
-+
-+/* HP Filters */
-+
-+float hpi_zero_coefsTbl[3] = {
-+    (float)0.92727436, (float)-1.8544941, (float)0.92727436
-+};
-+float hpi_pole_coefsTbl[3] = {
-+    (float)1.0, (float)-1.9059465, (float)0.9114024
-+};
-+float hpo_zero_coefsTbl[3] = {
-+    (float)0.93980581, (float)-1.8795834, (float)0.93980581
-+};
-+float hpo_pole_coefsTbl[3] = {
-+    (float)1.0, (float)-1.9330735, (float)0.93589199
-+};
-+
-+/* LP Filter */
-+
-+float lpFilt_coefsTbl[FILTERORDER_DS]={
-+    (float)-0.066650, (float)0.125000, (float)0.316650, 
-+    (float)0.414063, (float)0.316650, 
-+    (float)0.125000, (float)-0.066650
-+};
-+
-+/* State quantization tables */
-+
-+float state_sq3Tbl[8] = {
-+    (float)-3.719849, (float)-2.177490, (float)-1.130005, 
-+    (float)-0.309692, (float)0.444214, (float)1.329712, 
-+    (float)2.436279, (float)3.983887
-+};
-+
-+float state_frgqTbl[64] = {
-+    (float)1.000085, (float)1.071695, (float)1.140395, 
-+    (float)1.206868, (float)1.277188, (float)1.351503, 
-+
-+
-+    (float)1.429380, (float)1.500727, (float)1.569049, 
-+    (float)1.639599, (float)1.707071, (float)1.781531, 
-+    (float)1.840799, (float)1.901550, (float)1.956695, 
-+    (float)2.006750, (float)2.055474, (float)2.102787, 
-+    (float)2.142819, (float)2.183592, (float)2.217962, 
-+    (float)2.257177, (float)2.295739, (float)2.332967, 
-+    (float)2.369248, (float)2.402792, (float)2.435080, 
-+    (float)2.468598, (float)2.503394, (float)2.539284, 
-+    (float)2.572944, (float)2.605036, (float)2.636331, 
-+    (float)2.668939, (float)2.698780, (float)2.729101, 
-+    (float)2.759786, (float)2.789834, (float)2.818679, 
-+    (float)2.848074, (float)2.877470, (float)2.906899, 
-+    (float)2.936655, (float)2.967804, (float)3.000115, 
-+    (float)3.033367, (float)3.066355, (float)3.104231, 
-+    (float)3.141499, (float)3.183012, (float)3.222952, 
-+    (float)3.265433, (float)3.308441, (float)3.350823, 
-+    (float)3.395275, (float)3.442793, (float)3.490801, 
-+    (float)3.542514, (float)3.604064, (float)3.666050, 
-+    (float)3.740994, (float)3.830749, (float)3.938770, 
-+    (float)4.101764
-+};
-+
-+/* CB tables */
-+
-+int search_rangeTbl[5][CB_NSTAGES]={{58,58,58}, {108,44,44}, 
-+            {108,108,108}, {108,108,108}, {108,108,108}};
-+int stMemLTbl=85;
-+int memLfTbl[NASUB_MAX]={147,147,147,147};
-+
-+/* expansion filter(s) */
-+
-+float cbfiltersTbl[CB_FILTERLEN]={
-+    (float)-0.034180, (float)0.108887, (float)-0.184326,
-+    (float)0.806152,  (float)0.713379, (float)-0.144043,
-+    (float)0.083740,  (float)-0.033691
-+};
-+
-+/* Gain Quantization */
-+
-+float gain_sq3Tbl[8]={
-+    (float)-1.000000,  (float)-0.659973,  (float)-0.330017,
-+    (float)0.000000, (float)0.250000, (float)0.500000, 
-+    (float)0.750000, (float)1.00000};
-+
-+float gain_sq4Tbl[16]={
-+    (float)-1.049988, (float)-0.900024, (float)-0.750000, 
-+    (float)-0.599976, (float)-0.450012, (float)-0.299988, 
-+    (float)-0.150024, (float)0.000000, (float)0.150024, 
-+    (float)0.299988, (float)0.450012, (float)0.599976, 
-+    (float)0.750000, (float)0.900024, (float)1.049988, 
-+    (float)1.200012};
-+
-+float gain_sq5Tbl[32]={
-+    (float)0.037476, (float)0.075012, (float)0.112488, 
-+
-+
-+    (float)0.150024, (float)0.187500, (float)0.224976, 
-+    (float)0.262512, (float)0.299988, (float)0.337524, 
-+    (float)0.375000, (float)0.412476, (float)0.450012, 
-+    (float)0.487488, (float)0.525024, (float)0.562500, 
-+    (float)0.599976, (float)0.637512, (float)0.674988, 
-+    (float)0.712524, (float)0.750000, (float)0.787476, 
-+    (float)0.825012, (float)0.862488, (float)0.900024, 
-+    (float)0.937500, (float)0.974976, (float)1.012512, 
-+    (float)1.049988, (float)1.087524, (float)1.125000, 
-+    (float)1.162476, (float)1.200012};
-+
-+/* Enhancer - Upsamling a factor 4 (ENH_UPS0 = 4) */
-+float polyphaserTbl[ENH_UPS0*(2*ENH_FL0+1)]={ 
-+    (float)0.000000, (float)0.000000, (float)0.000000,
-+(float)1.000000, 
-+        (float)0.000000, (float)0.000000, (float)0.000000, 
-+    (float)0.015625, (float)-0.076904, (float)0.288330,
-+(float)0.862061, 
-+        (float)-0.106445, (float)0.018799, (float)-0.015625, 
-+    (float)0.023682, (float)-0.124268, (float)0.601563,
-+(float)0.601563, 
-+        (float)-0.124268, (float)0.023682, (float)-0.023682, 
-+    (float)0.018799, (float)-0.106445, (float)0.862061,
-+(float)0.288330, 
-+        (float)-0.076904, (float)0.015625, (float)-0.018799};
-+
-+float enh_plocsTbl[ENH_NBLOCKS_TOT] = {(float)40.0, (float)120.0, 
-+            (float)200.0, (float)280.0, (float)360.0, 
-+            (float)440.0, (float)520.0, (float)600.0};
-+
-+/* LPC analysis and quantization */ 
-+
-+int dim_lsfCbTbl[LSF_NSPLIT] = {3, 3, 4};
-+int size_lsfCbTbl[LSF_NSPLIT] = {64,128,128};
-+
-+
-+float lsfmeanTbl[LPC_FILTERORDER] = { 
-+    (float)0.281738, (float)0.445801, (float)0.663330, 
-+    (float)0.962524, (float)1.251831, (float)1.533081, 
-+    (float)1.850586, (float)2.137817, (float)2.481445, 
-+    (float)2.777344};
-+
-+float lsf_weightTbl_30ms[6] = {(float)(1.0/2.0), (float)1.0,
-+(float)(2.0/3.0), 
-+    (float)(1.0/3.0), (float)0.0, (float)0.0};
-+
-+float lsf_weightTbl_20ms[4] = {(float)(3.0/4.0), (float)(2.0/4.0), 
-+    (float)(1.0/4.0), (float)(0.0)};
-+
-+/* Hanning LPC window */
-+float lpc_winTbl[BLOCKL_MAX]={
-+    (float)0.000183, (float)0.000671, (float)0.001526,
-+    (float)0.002716, (float)0.004242, (float)0.006104,
-+    (float)0.008301, (float)0.010834, (float)0.013702,
-+
-+
-+    (float)0.016907, (float)0.020416, (float)0.024261,
-+    (float)0.028442, (float)0.032928, (float)0.037750,
-+    (float)0.042877, (float)0.048309, (float)0.054047,
-+    (float)0.060089, (float)0.066437, (float)0.073090,
-+    (float)0.080017, (float)0.087219, (float)0.094727,
-+    (float)0.102509, (float)0.110535, (float)0.118835,
-+    (float)0.127411, (float)0.136230, (float)0.145294,
-+    (float)0.154602, (float)0.164154, (float)0.173920,
-+    (float)0.183899, (float)0.194122, (float)0.204529,
-+    (float)0.215149, (float)0.225952, (float)0.236938,
-+    (float)0.248108, (float)0.259460, (float)0.270966,
-+    (float)0.282654, (float)0.294464, (float)0.306396,
-+    (float)0.318481, (float)0.330688, (float)0.343018,
-+    (float)0.355438, (float)0.367981, (float)0.380585,
-+    (float)0.393280, (float)0.406067, (float)0.418884,
-+    (float)0.431763, (float)0.444702, (float)0.457672,
-+    (float)0.470673, (float)0.483704, (float)0.496735,
-+    (float)0.509766, (float)0.522797, (float)0.535828,
-+    (float)0.548798, (float)0.561768, (float)0.574677,
-+    (float)0.587524, (float)0.600342, (float)0.613068,
-+    (float)0.625732, (float)0.638306, (float)0.650787,
-+    (float)0.663147, (float)0.675415, (float)0.687561,
-+    (float)0.699585, (float)0.711487, (float)0.723206,
-+    (float)0.734802, (float)0.746216, (float)0.757477,
-+    (float)0.768585, (float)0.779480, (float)0.790192,
-+    (float)0.800720, (float)0.811005, (float)0.821106,
-+    (float)0.830994, (float)0.840668, (float)0.850067,
-+    (float)0.859253, (float)0.868225, (float)0.876892,
-+    (float)0.885345, (float)0.893524, (float)0.901428,
-+    (float)0.909058, (float)0.916412, (float)0.923492,
-+    (float)0.930267, (float)0.936768, (float)0.942963,
-+    (float)0.948853, (float)0.954437, (float)0.959717,
-+    (float)0.964691, (float)0.969360, (float)0.973694,
-+    (float)0.977692, (float)0.981384, (float)0.984741,
-+    (float)0.987762, (float)0.990479, (float)0.992828,
-+    (float)0.994873, (float)0.996552, (float)0.997925,
-+    (float)0.998932, (float)0.999603, (float)0.999969,
-+    (float)0.999969, (float)0.999603, (float)0.998932,
-+    (float)0.997925, (float)0.996552, (float)0.994873,
-+    (float)0.992828, (float)0.990479, (float)0.987762,
-+    (float)0.984741, (float)0.981384, (float)0.977692,
-+    (float)0.973694, (float)0.969360, (float)0.964691,
-+    (float)0.959717, (float)0.954437, (float)0.948853,
-+    (float)0.942963, (float)0.936768, (float)0.930267,
-+    (float)0.923492, (float)0.916412, (float)0.909058,
-+    (float)0.901428, (float)0.893524, (float)0.885345,
-+    (float)0.876892, (float)0.868225, (float)0.859253,
-+    (float)0.850067, (float)0.840668, (float)0.830994,
-+    (float)0.821106, (float)0.811005, (float)0.800720,
-+    (float)0.790192, (float)0.779480, (float)0.768585,
-+    (float)0.757477, (float)0.746216, (float)0.734802,
-+    (float)0.723206, (float)0.711487, (float)0.699585,
-+    (float)0.687561, (float)0.675415, (float)0.663147,
-+    (float)0.650787, (float)0.638306, (float)0.625732,
-+
-+
-+    (float)0.613068, (float)0.600342, (float)0.587524,
-+    (float)0.574677, (float)0.561768, (float)0.548798,
-+    (float)0.535828, (float)0.522797, (float)0.509766,
-+    (float)0.496735, (float)0.483704, (float)0.470673,
-+    (float)0.457672, (float)0.444702, (float)0.431763,
-+    (float)0.418884, (float)0.406067, (float)0.393280,
-+    (float)0.380585, (float)0.367981, (float)0.355438,
-+    (float)0.343018, (float)0.330688, (float)0.318481,
-+    (float)0.306396, (float)0.294464, (float)0.282654,
-+    (float)0.270966, (float)0.259460, (float)0.248108,
-+    (float)0.236938, (float)0.225952, (float)0.215149,
-+    (float)0.204529, (float)0.194122, (float)0.183899,
-+    (float)0.173920, (float)0.164154, (float)0.154602,
-+    (float)0.145294, (float)0.136230, (float)0.127411,
-+    (float)0.118835, (float)0.110535, (float)0.102509,
-+    (float)0.094727, (float)0.087219, (float)0.080017,
-+    (float)0.073090, (float)0.066437, (float)0.060089,
-+    (float)0.054047, (float)0.048309, (float)0.042877,
-+    (float)0.037750, (float)0.032928, (float)0.028442,
-+    (float)0.024261, (float)0.020416, (float)0.016907,
-+    (float)0.013702, (float)0.010834, (float)0.008301,
-+    (float)0.006104, (float)0.004242, (float)0.002716,
-+    (float)0.001526, (float)0.000671, (float)0.000183
-+};
-+
-+/* Asymmetric LPC window */
-+float lpc_asymwinTbl[BLOCKL_MAX]={
-+    (float)0.000061, (float)0.000214, (float)0.000458,
-+    (float)0.000824, (float)0.001282, (float)0.001831,
-+    (float)0.002472, (float)0.003235, (float)0.004120,
-+    (float)0.005066, (float)0.006134, (float)0.007294,
-+    (float)0.008545, (float)0.009918, (float)0.011383,
-+    (float)0.012939, (float)0.014587, (float)0.016357,
-+    (float)0.018219, (float)0.020172, (float)0.022217,
-+    (float)0.024353, (float)0.026611, (float)0.028961,
-+    (float)0.031372, (float)0.033905, (float)0.036530,
-+    (float)0.039276, (float)0.042084, (float)0.044983,
-+    (float)0.047974, (float)0.051086, (float)0.054260,
-+    (float)0.057526, (float)0.060883, (float)0.064331,
-+    (float)0.067871, (float)0.071503, (float)0.075226,
-+    (float)0.079010, (float)0.082916, (float)0.086884,
-+    (float)0.090942, (float)0.095062, (float)0.099304,
-+    (float)0.103607, (float)0.107971, (float)0.112427,
-+    (float)0.116974, (float)0.121582, (float)0.126282,
-+    (float)0.131073, (float)0.135895, (float)0.140839,
-+    (float)0.145813, (float)0.150879, (float)0.156006,
-+    (float)0.161224, (float)0.166504, (float)0.171844,
-+    (float)0.177246, (float)0.182709, (float)0.188263,
-+    (float)0.193848, (float)0.199524, (float)0.205231,
-+    (float)0.211029, (float)0.216858, (float)0.222778,
-+    (float)0.228729, (float)0.234741, (float)0.240814,
-+    (float)0.246918, (float)0.253082, (float)0.259308,
-+    (float)0.265564, (float)0.271881, (float)0.278259,
-+    (float)0.284668, (float)0.291107, (float)0.297607,
-+
-+
-+    (float)0.304138, (float)0.310730, (float)0.317322,
-+    (float)0.323975, (float)0.330658, (float)0.337372,
-+    (float)0.344147, (float)0.350922, (float)0.357727,
-+    (float)0.364594, (float)0.371460, (float)0.378357,
-+    (float)0.385284, (float)0.392212, (float)0.399170,
-+    (float)0.406158, (float)0.413177, (float)0.420197,
-+    (float)0.427246, (float)0.434296, (float)0.441376,
-+    (float)0.448456, (float)0.455536, (float)0.462646,
-+    (float)0.469757, (float)0.476868, (float)0.483978,
-+    (float)0.491089, (float)0.498230, (float)0.505341,
-+    (float)0.512451, (float)0.519592, (float)0.526703,
-+    (float)0.533813, (float)0.540924, (float)0.548004,
-+    (float)0.555084, (float)0.562164, (float)0.569244,
-+    (float)0.576294, (float)0.583313, (float)0.590332,
-+    (float)0.597321, (float)0.604309, (float)0.611267,
-+    (float)0.618195, (float)0.625092, (float)0.631989,
-+    (float)0.638855, (float)0.645660, (float)0.652466,
-+    (float)0.659241, (float)0.665985, (float)0.672668,
-+    (float)0.679352, (float)0.685974, (float)0.692566,
-+    (float)0.699127, (float)0.705658, (float)0.712128,
-+    (float)0.718536, (float)0.724945, (float)0.731262,
-+    (float)0.737549, (float)0.743805, (float)0.750000,
-+    (float)0.756134, (float)0.762238, (float)0.768280,
-+    (float)0.774261, (float)0.780182, (float)0.786072,
-+    (float)0.791870, (float)0.797638, (float)0.803314,
-+    (float)0.808960, (float)0.814514, (float)0.820038,
-+    (float)0.825470, (float)0.830841, (float)0.836151,
-+    (float)0.841400, (float)0.846558, (float)0.851654,
-+    (float)0.856689, (float)0.861633, (float)0.866516,
-+    (float)0.871338, (float)0.876068, (float)0.880737,
-+    (float)0.885315, (float)0.889801, (float)0.894226,
-+    (float)0.898560, (float)0.902832, (float)0.907013,
-+    (float)0.911102, (float)0.915100, (float)0.919037,
-+    (float)0.922882, (float)0.926636, (float)0.930328,
-+    (float)0.933899, (float)0.937408, (float)0.940796,
-+    (float)0.944122, (float)0.947357, (float)0.950470,
-+    (float)0.953522, (float)0.956482, (float)0.959351,
-+    (float)0.962097, (float)0.964783, (float)0.967377,
-+    (float)0.969849, (float)0.972229, (float)0.974518,
-+    (float)0.976715, (float)0.978821, (float)0.980835,
-+    (float)0.982727, (float)0.984528, (float)0.986237,
-+    (float)0.987854, (float)0.989380, (float)0.990784,
-+    (float)0.992096, (float)0.993317, (float)0.994415,
-+    (float)0.995422, (float)0.996338, (float)0.997162,
-+    (float)0.997864, (float)0.998474, (float)0.998962,
-+    (float)0.999390, (float)0.999695, (float)0.999878,
-+    (float)0.999969, (float)0.999969, (float)0.996918,
-+    (float)0.987701, (float)0.972382, (float)0.951050,
-+    (float)0.923889, (float)0.891022, (float)0.852631,
-+    (float)0.809021, (float)0.760406, (float)0.707092,
-+    (float)0.649445, (float)0.587799, (float)0.522491,
-+    (float)0.453979, (float)0.382690, (float)0.309021,
-+    (float)0.233459, (float)0.156433, (float)0.078461
-+};
-+
-+
-+
-+/* Lag window for LPC */
-+float lpc_lagwinTbl[LPC_FILTERORDER + 1]={
-+    (float)1.000100, (float)0.998890, (float)0.995569,
-+        (float)0.990057, (float)0.982392,
-+    (float)0.972623, (float)0.960816, (float)0.947047,
-+        (float)0.931405, (float)0.913989, (float)0.894909};
-+
-+/* LSF quantization*/
-+float lsfCbTbl[64 * 3 + 128 * 3 + 128 * 4] = {
-+(float)0.155396, (float)0.273193, (float)0.451172,
-+(float)0.390503, (float)0.648071, (float)1.002075,
-+(float)0.440186, (float)0.692261, (float)0.955688,
-+(float)0.343628, (float)0.642334, (float)1.071533,
-+(float)0.318359, (float)0.491577, (float)0.670532,
-+(float)0.193115, (float)0.375488, (float)0.725708,
-+(float)0.364136, (float)0.510376, (float)0.658691,
-+(float)0.297485, (float)0.527588, (float)0.842529,
-+(float)0.227173, (float)0.365967, (float)0.563110,
-+(float)0.244995, (float)0.396729, (float)0.636475,
-+(float)0.169434, (float)0.300171, (float)0.520264,
-+(float)0.312866, (float)0.464478, (float)0.643188,
-+(float)0.248535, (float)0.429932, (float)0.626099,
-+(float)0.236206, (float)0.491333, (float)0.817139,
-+(float)0.334961, (float)0.625122, (float)0.895752,
-+(float)0.343018, (float)0.518555, (float)0.698608,
-+(float)0.372803, (float)0.659790, (float)0.945435,
-+(float)0.176880, (float)0.316528, (float)0.581421,
-+(float)0.416382, (float)0.625977, (float)0.805176,
-+(float)0.303223, (float)0.568726, (float)0.915039,
-+(float)0.203613, (float)0.351440, (float)0.588135,
-+(float)0.221191, (float)0.375000, (float)0.614746,
-+(float)0.199951, (float)0.323364, (float)0.476074,
-+(float)0.300781, (float)0.433350, (float)0.566895,
-+(float)0.226196, (float)0.354004, (float)0.507568,
-+(float)0.300049, (float)0.508179, (float)0.711670,
-+(float)0.312012, (float)0.492676, (float)0.763428,
-+(float)0.329956, (float)0.541016, (float)0.795776,
-+(float)0.373779, (float)0.604614, (float)0.928833,
-+(float)0.210571, (float)0.452026, (float)0.755249,
-+(float)0.271118, (float)0.473267, (float)0.662476,
-+(float)0.285522, (float)0.436890, (float)0.634399,
-+(float)0.246704, (float)0.565552, (float)0.859009,
-+(float)0.270508, (float)0.406250, (float)0.553589,
-+(float)0.361450, (float)0.578491, (float)0.813843,
-+(float)0.342651, (float)0.482788, (float)0.622437,
-+(float)0.340332, (float)0.549438, (float)0.743164,
-+(float)0.200439, (float)0.336304, (float)0.540894,
-+(float)0.407837, (float)0.644775, (float)0.895142,
-+(float)0.294678, (float)0.454834, (float)0.699097,
-+(float)0.193115, (float)0.344482, (float)0.643188,
-+(float)0.275757, (float)0.420776, (float)0.598755,
-+(float)0.380493, (float)0.608643, (float)0.861084,
-+(float)0.222778, (float)0.426147, (float)0.676514,
-+
-+
-+(float)0.407471, (float)0.700195, (float)1.053101,
-+(float)0.218384, (float)0.377197, (float)0.669922,
-+(float)0.313232, (float)0.454102, (float)0.600952,
-+(float)0.347412, (float)0.571533, (float)0.874146,
-+(float)0.238037, (float)0.405396, (float)0.729492,
-+(float)0.223877, (float)0.412964, (float)0.822021,
-+(float)0.395264, (float)0.582153, (float)0.743896,
-+(float)0.247925, (float)0.485596, (float)0.720581,
-+(float)0.229126, (float)0.496582, (float)0.907715,
-+(float)0.260132, (float)0.566895, (float)1.012695,
-+(float)0.337402, (float)0.611572, (float)0.978149,
-+(float)0.267822, (float)0.447632, (float)0.769287,
-+(float)0.250610, (float)0.381714, (float)0.530029,
-+(float)0.430054, (float)0.805054, (float)1.221924,
-+(float)0.382568, (float)0.544067, (float)0.701660,
-+(float)0.383545, (float)0.710327, (float)1.149170,
-+(float)0.271362, (float)0.529053, (float)0.775513,
-+(float)0.246826, (float)0.393555, (float)0.588623,
-+(float)0.266846, (float)0.422119, (float)0.676758,
-+(float)0.311523, (float)0.580688, (float)0.838623,
-+(float)1.331177, (float)1.576782, (float)1.779541,
-+(float)1.160034, (float)1.401978, (float)1.768188,
-+(float)1.161865, (float)1.525146, (float)1.715332,
-+(float)0.759521, (float)0.913940, (float)1.119873,
-+(float)0.947144, (float)1.121338, (float)1.282471,
-+(float)1.015015, (float)1.557007, (float)1.804932,
-+(float)1.172974, (float)1.402100, (float)1.692627,
-+(float)1.087524, (float)1.474243, (float)1.665405,
-+(float)0.899536, (float)1.105225, (float)1.406250,
-+(float)1.148438, (float)1.484741, (float)1.796265,
-+(float)0.785645, (float)1.209839, (float)1.567749,
-+(float)0.867798, (float)1.166504, (float)1.450684,
-+(float)0.922485, (float)1.229858, (float)1.420898,
-+(float)0.791260, (float)1.123291, (float)1.409546,
-+(float)0.788940, (float)0.966064, (float)1.340332,
-+(float)1.051147, (float)1.272827, (float)1.556641,
-+(float)0.866821, (float)1.181152, (float)1.538818,
-+(float)0.906738, (float)1.373535, (float)1.607910,
-+(float)1.244751, (float)1.581421, (float)1.933838,
-+(float)0.913940, (float)1.337280, (float)1.539673,
-+(float)0.680542, (float)0.959229, (float)1.662720,
-+(float)0.887207, (float)1.430542, (float)1.800781,
-+(float)0.912598, (float)1.433594, (float)1.683960,
-+(float)0.860474, (float)1.060303, (float)1.455322,
-+(float)1.005127, (float)1.381104, (float)1.706909,
-+(float)0.800781, (float)1.363892, (float)1.829102,
-+(float)0.781860, (float)1.124390, (float)1.505981,
-+(float)1.003662, (float)1.471436, (float)1.684692,
-+(float)0.981323, (float)1.309570, (float)1.618042,
-+(float)1.228760, (float)1.554321, (float)1.756470,
-+(float)0.734375, (float)0.895752, (float)1.225586,
-+(float)0.841797, (float)1.055664, (float)1.249268,
-+(float)0.920166, (float)1.119385, (float)1.486206,
-+(float)0.894409, (float)1.539063, (float)1.828979,
-+
-+
-+(float)1.283691, (float)1.543335, (float)1.858276,
-+(float)0.676025, (float)0.933105, (float)1.490845,
-+(float)0.821289, (float)1.491821, (float)1.739868,
-+(float)0.923218, (float)1.144653, (float)1.580566,
-+(float)1.057251, (float)1.345581, (float)1.635864,
-+(float)0.888672, (float)1.074951, (float)1.353149,
-+(float)0.942749, (float)1.195435, (float)1.505493,
-+(float)1.492310, (float)1.788086, (float)2.039673,
-+(float)1.070313, (float)1.634399, (float)1.860962,
-+(float)1.253296, (float)1.488892, (float)1.686035,
-+(float)0.647095, (float)0.864014, (float)1.401855,
-+(float)0.866699, (float)1.254883, (float)1.453369,
-+(float)1.063965, (float)1.532593, (float)1.731323,
-+(float)1.167847, (float)1.521484, (float)1.884033,
-+(float)0.956055, (float)1.502075, (float)1.745605,
-+(float)0.928711, (float)1.288574, (float)1.479614,
-+(float)1.088013, (float)1.380737, (float)1.570801,
-+(float)0.905029, (float)1.186768, (float)1.371948,
-+(float)1.057861, (float)1.421021, (float)1.617432,
-+(float)1.108276, (float)1.312500, (float)1.501465,
-+(float)0.979492, (float)1.416992, (float)1.624268,
-+(float)1.276001, (float)1.661011, (float)2.007935,
-+(float)0.993042, (float)1.168579, (float)1.331665,
-+(float)0.778198, (float)0.944946, (float)1.235962,
-+(float)1.223755, (float)1.491333, (float)1.815674,
-+(float)0.852661, (float)1.350464, (float)1.722290,
-+(float)1.134766, (float)1.593140, (float)1.787354,
-+(float)1.051392, (float)1.339722, (float)1.531006,
-+(float)0.803589, (float)1.271240, (float)1.652100,
-+(float)0.755737, (float)1.143555, (float)1.639404,
-+(float)0.700928, (float)0.837280, (float)1.130371,
-+(float)0.942749, (float)1.197876, (float)1.669800,
-+(float)0.993286, (float)1.378296, (float)1.566528,
-+(float)0.801025, (float)1.095337, (float)1.298950,
-+(float)0.739990, (float)1.032959, (float)1.383667,
-+(float)0.845703, (float)1.072266, (float)1.543823,
-+(float)0.915649, (float)1.072266, (float)1.224487,
-+(float)1.021973, (float)1.226196, (float)1.481323,
-+(float)0.999878, (float)1.204102, (float)1.555908,
-+(float)0.722290, (float)0.913940, (float)1.340210,
-+(float)0.673340, (float)0.835938, (float)1.259521,
-+(float)0.832397, (float)1.208374, (float)1.394165,
-+(float)0.962158, (float)1.576172, (float)1.912842,
-+(float)1.166748, (float)1.370850, (float)1.556763,
-+(float)0.946289, (float)1.138550, (float)1.400391,
-+(float)1.035034, (float)1.218262, (float)1.386475,
-+(float)1.393799, (float)1.717773, (float)2.000244,
-+(float)0.972656, (float)1.260986, (float)1.760620,
-+(float)1.028198, (float)1.288452, (float)1.484619,
-+(float)0.773560, (float)1.258057, (float)1.756714,
-+(float)1.080322, (float)1.328003, (float)1.742676,
-+(float)0.823975, (float)1.450806, (float)1.917725,
-+(float)0.859009, (float)1.016602, (float)1.191895,
-+(float)0.843994, (float)1.131104, (float)1.645020,
-+
-+
-+(float)1.189697, (float)1.702759, (float)1.894409,
-+(float)1.346680, (float)1.763184, (float)2.066040,
-+(float)0.980469, (float)1.253784, (float)1.441650,
-+(float)1.338135, (float)1.641968, (float)1.932739,
-+(float)1.223267, (float)1.424194, (float)1.626465,
-+(float)0.765747, (float)1.004150, (float)1.579102,
-+(float)1.042847, (float)1.269165, (float)1.647461,
-+(float)0.968750, (float)1.257568, (float)1.555786,
-+(float)0.826294, (float)0.993408, (float)1.275146,
-+(float)0.742310, (float)0.950439, (float)1.430542,
-+(float)1.054321, (float)1.439819, (float)1.828003,
-+(float)1.072998, (float)1.261719, (float)1.441895,
-+(float)0.859375, (float)1.036377, (float)1.314819,
-+(float)0.895752, (float)1.267212, (float)1.605591,
-+(float)0.805420, (float)0.962891, (float)1.142334,
-+(float)0.795654, (float)1.005493, (float)1.468506,
-+(float)1.105347, (float)1.313843, (float)1.584839,
-+(float)0.792236, (float)1.221802, (float)1.465698,
-+(float)1.170532, (float)1.467651, (float)1.664063,
-+(float)0.838257, (float)1.153198, (float)1.342163,
-+(float)0.968018, (float)1.198242, (float)1.391235,
-+(float)1.250122, (float)1.623535, (float)1.823608,
-+(float)0.711670, (float)1.058350, (float)1.512085,
-+(float)1.204834, (float)1.454468, (float)1.739136,
-+(float)1.137451, (float)1.421753, (float)1.620117,
-+(float)0.820435, (float)1.322754, (float)1.578247,
-+(float)0.798706, (float)1.005005, (float)1.213867,
-+(float)0.980713, (float)1.324951, (float)1.512939,
-+(float)1.112305, (float)1.438843, (float)1.735596,
-+(float)1.135498, (float)1.356689, (float)1.635742,
-+(float)1.101318, (float)1.387451, (float)1.686523,
-+(float)0.849854, (float)1.276978, (float)1.523438,
-+(float)1.377930, (float)1.627563, (float)1.858154,
-+(float)0.884888, (float)1.095459, (float)1.287476,
-+(float)1.289795, (float)1.505859, (float)1.756592,
-+(float)0.817505, (float)1.384155, (float)1.650513,
-+(float)1.446655, (float)1.702148, (float)1.931885,
-+(float)0.835815, (float)1.023071, (float)1.385376,
-+(float)0.916626, (float)1.139038, (float)1.335327,
-+(float)0.980103, (float)1.174072, (float)1.453735,
-+(float)1.705688, (float)2.153809, (float)2.398315, (float)2.743408,
-+(float)1.797119, (float)2.016846, (float)2.445679, (float)2.701904,
-+(float)1.990356, (float)2.219116, (float)2.576416, (float)2.813477,
-+(float)1.849365, (float)2.190918, (float)2.611572, (float)2.835083,
-+(float)1.657959, (float)1.854370, (float)2.159058, (float)2.726196,
-+(float)1.437744, (float)1.897705, (float)2.253174, (float)2.655396,
-+(float)2.028687, (float)2.247314, (float)2.542358, (float)2.875854,
-+(float)1.736938, (float)1.922119, (float)2.185913, (float)2.743408,
-+(float)1.521606, (float)1.870972, (float)2.526855, (float)2.786987,
-+(float)1.841431, (float)2.050659, (float)2.463623, (float)2.857666,
-+(float)1.590088, (float)2.067261, (float)2.427979, (float)2.794434,
-+(float)1.746826, (float)2.057373, (float)2.320190, (float)2.800781,
-+(float)1.734619, (float)1.940552, (float)2.306030, (float)2.826416,
-+(float)1.786255, (float)2.204468, (float)2.457520, (float)2.795288,
-+
-+
-+(float)1.861084, (float)2.170532, (float)2.414551, (float)2.763672,
-+(float)2.001465, (float)2.307617, (float)2.552734, (float)2.811890,
-+(float)1.784424, (float)2.124146, (float)2.381592, (float)2.645508,
-+(float)1.888794, (float)2.135864, (float)2.418579, (float)2.861206,
-+(float)2.301147, (float)2.531250, (float)2.724976, (float)2.913086,
-+(float)1.837769, (float)2.051270, (float)2.261963, (float)2.553223,
-+(float)2.012939, (float)2.221191, (float)2.440186, (float)2.678101,
-+(float)1.429565, (float)1.858276, (float)2.582275, (float)2.845703,
-+(float)1.622803, (float)1.897705, (float)2.367310, (float)2.621094,
-+(float)1.581543, (float)1.960449, (float)2.515869, (float)2.736450,
-+(float)1.419434, (float)1.933960, (float)2.394653, (float)2.746704,
-+(float)1.721924, (float)2.059570, (float)2.421753, (float)2.769653,
-+(float)1.911011, (float)2.220703, (float)2.461060, (float)2.740723,
-+(float)1.581177, (float)1.860840, (float)2.516968, (float)2.874634,
-+(float)1.870361, (float)2.098755, (float)2.432373, (float)2.656494,
-+(float)2.059692, (float)2.279785, (float)2.495605, (float)2.729370,
-+(float)1.815674, (float)2.181519, (float)2.451538, (float)2.680542,
-+(float)1.407959, (float)1.768311, (float)2.343018, (float)2.668091,
-+(float)2.168701, (float)2.394653, (float)2.604736, (float)2.829346,
-+(float)1.636230, (float)1.865723, (float)2.329102, (float)2.824219,
-+(float)1.878906, (float)2.139526, (float)2.376709, (float)2.679810,
-+(float)1.765381, (float)1.971802, (float)2.195435, (float)2.586914,
-+(float)2.164795, (float)2.410889, (float)2.673706, (float)2.903198,
-+(float)2.071899, (float)2.331055, (float)2.645874, (float)2.907104,
-+(float)2.026001, (float)2.311523, (float)2.594849, (float)2.863892,
-+(float)1.948975, (float)2.180786, (float)2.514893, (float)2.797852,
-+(float)1.881836, (float)2.130859, (float)2.478149, (float)2.804199,
-+(float)2.238159, (float)2.452759, (float)2.652832, (float)2.868286,
-+(float)1.897949, (float)2.101685, (float)2.524292, (float)2.880127,
-+(float)1.856445, (float)2.074585, (float)2.541016, (float)2.791748,
-+(float)1.695557, (float)2.199097, (float)2.506226, (float)2.742676,
-+(float)1.612671, (float)1.877075, (float)2.435425, (float)2.732910,
-+(float)1.568848, (float)1.786499, (float)2.194580, (float)2.768555,
-+(float)1.953369, (float)2.164551, (float)2.486938, (float)2.874023,
-+(float)1.388306, (float)1.725342, (float)2.384521, (float)2.771851,
-+(float)2.115356, (float)2.337769, (float)2.592896, (float)2.864014,
-+(float)1.905762, (float)2.111328, (float)2.363525, (float)2.789307,
-+(float)1.882568, (float)2.332031, (float)2.598267, (float)2.827637,
-+(float)1.683594, (float)2.088745, (float)2.361938, (float)2.608643,
-+(float)1.874023, (float)2.182129, (float)2.536133, (float)2.766968,
-+(float)1.861938, (float)2.070435, (float)2.309692, (float)2.700562,
-+(float)1.722168, (float)2.107422, (float)2.477295, (float)2.837646,
-+(float)1.926880, (float)2.184692, (float)2.442627, (float)2.663818,
-+(float)2.123901, (float)2.337280, (float)2.553101, (float)2.777466,
-+(float)1.588135, (float)1.911499, (float)2.212769, (float)2.543945,
-+(float)2.053955, (float)2.370850, (float)2.712158, (float)2.939941,
-+(float)2.210449, (float)2.519653, (float)2.770386, (float)2.958618,
-+(float)2.199463, (float)2.474731, (float)2.718262, (float)2.919922,
-+(float)1.960083, (float)2.175415, (float)2.608032, (float)2.888794,
-+(float)1.953735, (float)2.185181, (float)2.428223, (float)2.809570,
-+(float)1.615234, (float)2.036499, (float)2.576538, (float)2.834595,
-+(float)1.621094, (float)2.028198, (float)2.431030, (float)2.664673,
-+(float)1.824951, (float)2.267456, (float)2.514526, (float)2.747925,
-+(float)1.994263, (float)2.229126, (float)2.475220, (float)2.833984,
-+
-+
-+(float)1.746338, (float)2.011353, (float)2.588257, (float)2.826904,
-+(float)1.562866, (float)2.135986, (float)2.471680, (float)2.687256,
-+(float)1.748901, (float)2.083496, (float)2.460938, (float)2.686279,
-+(float)1.758057, (float)2.131470, (float)2.636597, (float)2.891602,
-+(float)2.071289, (float)2.299072, (float)2.550781, (float)2.814331,
-+(float)1.839600, (float)2.094360, (float)2.496460, (float)2.723999,
-+(float)1.882202, (float)2.088257, (float)2.636841, (float)2.923096,
-+(float)1.957886, (float)2.153198, (float)2.384399, (float)2.615234,
-+(float)1.992920, (float)2.351196, (float)2.654419, (float)2.889771,
-+(float)2.012817, (float)2.262451, (float)2.643799, (float)2.903076,
-+(float)2.025635, (float)2.254761, (float)2.508423, (float)2.784058,
-+(float)2.316040, (float)2.589355, (float)2.794189, (float)2.963623,
-+(float)1.741211, (float)2.279541, (float)2.578491, (float)2.816284,
-+(float)1.845337, (float)2.055786, (float)2.348511, (float)2.822021,
-+(float)1.679932, (float)1.926514, (float)2.499756, (float)2.835693,
-+(float)1.722534, (float)1.946899, (float)2.448486, (float)2.728760,
-+(float)1.829834, (float)2.043213, (float)2.580444, (float)2.867676,
-+(float)1.676636, (float)2.071655, (float)2.322510, (float)2.704834,
-+(float)1.791504, (float)2.113525, (float)2.469727, (float)2.784058,
-+(float)1.977051, (float)2.215088, (float)2.497437, (float)2.726929,
-+(float)1.800171, (float)2.106689, (float)2.357788, (float)2.738892,
-+(float)1.827759, (float)2.170166, (float)2.525879, (float)2.852417,
-+(float)1.918335, (float)2.132813, (float)2.488403, (float)2.728149,
-+(float)1.916748, (float)2.225098, (float)2.542603, (float)2.857666,
-+(float)1.761230, (float)1.976074, (float)2.507446, (float)2.884521,
-+(float)2.053711, (float)2.367432, (float)2.608032, (float)2.837646,
-+(float)1.595337, (float)2.000977, (float)2.307129, (float)2.578247,
-+(float)1.470581, (float)2.031250, (float)2.375854, (float)2.647583,
-+(float)1.801392, (float)2.128052, (float)2.399780, (float)2.822876,
-+(float)1.853638, (float)2.066650, (float)2.429199, (float)2.751465,
-+(float)1.956299, (float)2.163696, (float)2.394775, (float)2.734253,
-+(float)1.963623, (float)2.275757, (float)2.585327, (float)2.865234,
-+(float)1.887451, (float)2.105469, (float)2.331787, (float)2.587402,
-+(float)2.120117, (float)2.443359, (float)2.733887, (float)2.941406,
-+(float)1.506348, (float)1.766968, (float)2.400513, (float)2.851807,
-+(float)1.664551, (float)1.981079, (float)2.375732, (float)2.774414,
-+(float)1.720703, (float)1.978882, (float)2.391479, (float)2.640991,
-+(float)1.483398, (float)1.814819, (float)2.434448, (float)2.722290,
-+(float)1.769043, (float)2.136597, (float)2.563721, (float)2.774414,
-+(float)1.810791, (float)2.049316, (float)2.373901, (float)2.613647,
-+(float)1.788330, (float)2.005981, (float)2.359131, (float)2.723145,
-+(float)1.785156, (float)1.993164, (float)2.399780, (float)2.832520,
-+(float)1.695313, (float)2.022949, (float)2.522583, (float)2.745117,
-+(float)1.584106, (float)1.965576, (float)2.299927, (float)2.715576,
-+(float)1.894897, (float)2.249878, (float)2.655884, (float)2.897705,
-+(float)1.720581, (float)1.995728, (float)2.299438, (float)2.557007,
-+(float)1.619385, (float)2.173950, (float)2.574219, (float)2.787964,
-+(float)1.883179, (float)2.220459, (float)2.474365, (float)2.825073,
-+(float)1.447632, (float)2.045044, (float)2.555542, (float)2.744873,
-+(float)1.502686, (float)2.156616, (float)2.653320, (float)2.846558,
-+(float)1.711548, (float)1.944092, (float)2.282959, (float)2.685791,
-+(float)1.499756, (float)1.867554, (float)2.341064, (float)2.578857,
-+(float)1.916870, (float)2.135132, (float)2.568237, (float)2.826050,
-+(float)1.498047, (float)1.711182, (float)2.223267, (float)2.755127,
-+
-+
-+(float)1.808716, (float)1.997559, (float)2.256470, (float)2.758545,
-+(float)2.088501, (float)2.402710, (float)2.667358, (float)2.890259,
-+(float)1.545044, (float)1.819214, (float)2.324097, (float)2.692993,
-+(float)1.796021, (float)2.012573, (float)2.505737, (float)2.784912,
-+(float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757,
-+(float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143
-+};
-+
-+
-diff -druN codecs/ilbc.orig/constants.h codecs/ilbc/constants.h
---- codecs/ilbc.orig/constants.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/constants.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,74 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    constants.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_CONSTANTS_H
-+#define __iLBC_CONSTANTS_H
-+
-+#include "iLBC_define.h"
-+
-+
-+/* ULP bit allocation */
-+
-+extern const iLBC_ULP_Inst_t ULP_20msTbl;
-+extern const iLBC_ULP_Inst_t ULP_30msTbl;
-+
-+/* high pass filters */
-+
-+extern float hpi_zero_coefsTbl[];
-+extern float hpi_pole_coefsTbl[];
-+extern float hpo_zero_coefsTbl[];
-+extern float hpo_pole_coefsTbl[];  
-+
-+/* low pass filters */
-+extern float lpFilt_coefsTbl[];
-+
-+/* LPC analysis and quantization */
-+
-+extern float lpc_winTbl[];
-+extern float lpc_asymwinTbl[];
-+extern float lpc_lagwinTbl[];
-+extern float lsfCbTbl[];
-+extern float lsfmeanTbl[];
-+extern int   dim_lsfCbTbl[];
-+extern int   size_lsfCbTbl[];
-+extern float lsf_weightTbl_30ms[]; 
-+extern float lsf_weightTbl_20ms[];
-+
-+/* state quantization tables */
-+
-+extern float state_sq3Tbl[];
-+extern float state_frgqTbl[];
-+
-+/* gain quantization tables */
-+
-+extern float gain_sq3Tbl[];
-+extern float gain_sq4Tbl[];
-+extern float gain_sq5Tbl[];
-+
-+/* adaptive codebook definitions */
-+
-+extern int search_rangeTbl[5][CB_NSTAGES];
-+extern int memLfTbl[];
-+extern int stMemLTbl;
-+extern float cbfiltersTbl[CB_FILTERLEN];
-+
-+
-+
-+/* enhancer definitions */
-+
-+extern float polyphaserTbl[];
-+extern float enh_plocsTbl[];
-+
-+#endif
-+
-diff -druN codecs/ilbc.orig/createCB.c codecs/ilbc/createCB.c
---- codecs/ilbc.orig/createCB.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/createCB.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,216 @@
-+
-+
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    createCB.c
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "iLBC_define.h"
-+#include "createCB.h"
-+#include "constants.h"
-+#include <string.h>
-+#include <math.h>
-+
-+/*----------------------------------------------------------------*
-+ *  Construct an additional codebook vector by filtering the
-+ *  initial codebook buffer. This vector is then used to expand
-+ *  the codebook with an additional section.
-+ *---------------------------------------------------------------*/
-+
-+void filteredCBvecs(
-+    float *cbvectors,   /* (o) Codebook vectors for the 
-+                               higher section */
-+    float *mem,         /* (i) Buffer to create codebook 
-+                               vector from */
-+    int lMem        /* (i) Length of buffer */
-+){
-+    int j, k;
-+    float *pp, *pp1;
-+    float tempbuff2[CB_MEML+CB_FILTERLEN];
-+    float *pos;
-+
-+    memset(tempbuff2, 0, (CB_HALFFILTERLEN-1)*sizeof(float));
-+    memcpy(&tempbuff2[CB_HALFFILTERLEN-1], mem, lMem*sizeof(float));
-+    memset(&tempbuff2[lMem+CB_HALFFILTERLEN-1], 0, 
-+        (CB_HALFFILTERLEN+1)*sizeof(float));
-+
-+    /* Create codebook vector for higher section by filtering */
-+
-+    /* do filtering */
-+    pos=cbvectors;
-+    memset(pos, 0, lMem*sizeof(float));
-+    for (k=0; k<lMem; k++) {
-+        pp=&tempbuff2[k];
-+        pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-+        for (j=0;j<CB_FILTERLEN;j++) {
-+            (*pos)+=(*pp++)*(*pp1--);
-+        }
-+        pos++;
-+    }
-+}
-+
-+
-+
-+/*----------------------------------------------------------------*
-+ *  Search the augmented part of the codebook to find the best
-+ *  measure.
-+ *----------------------------------------------------------------*/
-+
-+void searchAugmentedCB(
-+    int low,        /* (i) Start index for the search */
-+    int high,           /* (i) End index for the search */
-+    int stage,          /* (i) Current stage */
-+    int startIndex,     /* (i) Codebook index for the first 
-+                               aug vector */
-+    float *target,      /* (i) Target vector for encoding */
-+    float *buffer,      /* (i) Pointer to the end of the buffer for
-+                               augmented codebook construction */
-+    float *max_measure, /* (i/o) Currently maximum measure */
-+    int *best_index,/* (o) Currently the best index */
-+    float *gain,    /* (o) Currently the best gain */
-+    float *energy,      /* (o) Energy of augmented codebook 
-+                               vectors */
-+    float *invenergy/* (o) Inv energy of augmented codebook 
-+                               vectors */
-+) {
-+    int icount, ilow, j, tmpIndex;
-+    float *pp, *ppo, *ppi, *ppe, crossDot, alfa; 
-+    float weighted, measure, nrjRecursive;
-+    float ftmp;
-+
-+    /* Compute the energy for the first (low-5) 
-+       noninterpolated samples */
-+    nrjRecursive = (float) 0.0;
-+    pp = buffer - low + 1;
-+    for (j=0; j<(low-5); j++) {
-+        nrjRecursive += ( (*pp)*(*pp) );
-+        pp++;
-+    }
-+    ppe = buffer - low;
-+
-+
-+    for (icount=low; icount<=high; icount++) {
-+
-+        /* Index of the codebook vector used for retrieving 
-+           energy values */
-+        tmpIndex = startIndex+icount-20;
-+
-+        ilow = icount-4;
-+            
-+        /* Update the energy recursively to save complexity */
-+        nrjRecursive = nrjRecursive + (*ppe)*(*ppe);
-+        ppe--;
-+        energy[tmpIndex] = nrjRecursive;
-+
-+        /* Compute cross dot product for the first (low-5) 
-+           samples */
-+        crossDot = (float) 0.0;
-+
-+
-+        pp = buffer-icount;
-+        for (j=0; j<ilow; j++) {
-+            crossDot += target[j]*(*pp++);
-+        }
-+
-+        /* interpolation */
-+        alfa = (float) 0.2;
-+        ppo = buffer-4;
-+        ppi = buffer-icount-4;
-+        for (j=ilow; j<icount; j++) {
-+            weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-+            ppo++;
-+            ppi++;
-+            energy[tmpIndex] += weighted*weighted;
-+            crossDot += target[j]*weighted;
-+            alfa += (float)0.2;
-+        }
-+
-+        /* Compute energy and cross dot product for the 
-+           remaining samples */
-+        pp = buffer - icount;
-+        for (j=icount; j<SUBL; j++) {
-+            energy[tmpIndex] += (*pp)*(*pp);
-+            crossDot += target[j]*(*pp++);
-+        }
-+        
-+        if (energy[tmpIndex]>0.0) {
-+            invenergy[tmpIndex]=(float)1.0/(energy[tmpIndex]+EPS);
-+        } else {
-+            invenergy[tmpIndex] = (float) 0.0;
-+        }
-+        
-+        if (stage==0) {
-+            measure = (float)-10000000.0;
-+            
-+            if (crossDot > 0.0) {
-+                measure = crossDot*crossDot*invenergy[tmpIndex];
-+            }
-+        }
-+        else {
-+            measure = crossDot*crossDot*invenergy[tmpIndex];
-+        }
-+    
-+        /* check if measure is better */
-+        ftmp = crossDot*invenergy[tmpIndex];
-+        
-+        if ((measure>*max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-+            *best_index = tmpIndex;
-+            *max_measure = measure;
-+            *gain = ftmp;
-+        }
-+    }
-+}
-+
-+
-+
-+
-+/*----------------------------------------------------------------*
-+ *  Recreate a specific codebook vector from the augmented part.
-+ *
-+ *----------------------------------------------------------------*/
-+
-+void createAugmentedVec(
-+    int index,      /* (i) Index for the augmented vector 
-+                           to be created */
-+    float *buffer,  /* (i) Pointer to the end of the buffer for
-+                           augmented codebook construction */
-+    float *cbVec/* (o) The construced codebook vector */
-+) {
-+    int ilow, j;
-+    float *pp, *ppo, *ppi, alfa, alfa1, weighted;
-+
-+    ilow = index-5;
-+            
-+    /* copy the first noninterpolated part */
-+
-+    pp = buffer-index;
-+    memcpy(cbVec,pp,sizeof(float)*index);
-+
-+    /* interpolation */
-+
-+    alfa1 = (float)0.2;
-+    alfa = 0.0;
-+    ppo = buffer-5;
-+    ppi = buffer-index-5;
-+    for (j=ilow; j<index; j++) {
-+        weighted = ((float)1.0-alfa)*(*ppo)+alfa*(*ppi);
-+        ppo++;
-+        ppi++;
-+        cbVec[j] = weighted;
-+        alfa += alfa1;
-+    }
-+
-+    /* copy the second noninterpolated part */
-+
-+    pp = buffer - index;
-+    memcpy(cbVec+index,pp,sizeof(float)*(SUBL-index));
-+}
-+
-+
-diff -druN codecs/ilbc.orig/createCB.h codecs/ilbc/createCB.h
---- codecs/ilbc.orig/createCB.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/createCB.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,56 @@
-+
-+/******************************************************************
-+
-+
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    createCB.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_CREATECB_H
-+#define __iLBC_CREATECB_H
-+
-+void filteredCBvecs(
-+    float *cbvectors,   /* (o) Codebook vector for the 
-+                               higher section */
-+    float *mem,         /* (i) Buffer to create codebook 
-+                               vectors from */
-+    int lMem        /* (i) Length of buffer */
-+);
-+
-+void searchAugmentedCB(
-+    int low,        /* (i) Start index for the search */
-+    int high,           /* (i) End index for the search */
-+    int stage,          /* (i) Current stage */
-+    int startIndex,     /* (i) CB index for the first 
-+                               augmented vector */
-+    float *target,      /* (i) Target vector for encoding */
-+    float *buffer,      /* (i) Pointer to the end of the 
-+                               buffer for augmented codebook 
-+                               construction */
-+    float *max_measure, /* (i/o) Currently maximum measure */
-+    int *best_index,/* (o) Currently the best index */
-+    float *gain,    /* (o) Currently the best gain */
-+    float *energy,      /* (o) Energy of augmented 
-+                               codebook vectors */
-+    float *invenergy/* (o) Inv energy of aug codebook 
-+                               vectors */
-+);
-+
-+void createAugmentedVec(
-+    int index,          /* (i) Index for the aug vector 
-+                               to be created */
-+    float *buffer,      /* (i) Pointer to the end of the 
-+                               buffer for augmented codebook 
-+                               construction */
-+    float *cbVec    /* (o) The construced codebook vector */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/doCPLC.c codecs/ilbc/doCPLC.c
---- codecs/ilbc.orig/doCPLC.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/doCPLC.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,259 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    doCPLC.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+#include "iLBC_define.h"
-+#include "doCPLC.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Compute cross correlation and pitch gain for pitch prediction
-+ *  of last subframe at given lag.
-+ *---------------------------------------------------------------*/
-+
-+static void compCorr(
-+    float *cc,      /* (o) cross correlation coefficient */
-+    float *gc,      /* (o) gain */
-+    float *pm,
-+    float *buffer,  /* (i) signal buffer */
-+    int lag,    /* (i) pitch lag */
-+    int bLen,       /* (i) length of buffer */
-+    int sRange      /* (i) correlation search length */
-+){
-+
-+
-+    int i;
-+    float ftmp1, ftmp2, ftmp3;
-+
-+    /* Guard against getting outside buffer */
-+    if ((bLen-sRange-lag)<0) {
-+        sRange=bLen-lag;
-+    }
-+
-+    ftmp1 = 0.0;
-+    ftmp2 = 0.0;
-+    ftmp3 = 0.0;
-+    for (i=0; i<sRange; i++) {
-+        ftmp1 += buffer[bLen-sRange+i] *
-+            buffer[bLen-sRange+i-lag];
-+        ftmp2 += buffer[bLen-sRange+i-lag] * 
-+                buffer[bLen-sRange+i-lag];
-+        ftmp3 += buffer[bLen-sRange+i] * 
-+                buffer[bLen-sRange+i];
-+    }
-+
-+    if (ftmp2 > 0.0) {
-+        *cc = ftmp1*ftmp1/ftmp2;
-+        *gc = (float)fabs(ftmp1/ftmp2);
-+        *pm=(float)fabs(ftmp1)/
-+            ((float)sqrt(ftmp2)*(float)sqrt(ftmp3));
-+    }
-+    else {
-+        *cc = 0.0;
-+        *gc = 0.0;
-+        *pm=0.0;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  Packet loss concealment routine. Conceals a residual signal
-+ *  and LP parameters. If no packet loss, update state.
-+ *---------------------------------------------------------------*/
-+
-+void doThePLC(
-+    float *PLCresidual, /* (o) concealed residual */ 
-+    float *PLClpc,      /* (o) concealed LP parameters */  
-+    int PLI,        /* (i) packet loss indicator 
-+                               0 - no PL, 1 = PL */ 
-+    float *decresidual, /* (i) decoded residual */
-+    float *lpc,         /* (i) decoded LPC (only used for no PL) */
-+    int inlag,          /* (i) pitch lag */
-+    iLBC_Dec_Inst_t *iLBCdec_inst 
-+                        /* (i/o) decoder instance */
-+){
-+    int lag=20, randlag;
-+    float gain, maxcc;
-+    float use_gain;
-+    float gain_comp, maxcc_comp, per, max_per;
-+    int i, pick, use_lag;
-+
-+
-+    float ftmp, randvec[BLOCKL_MAX], pitchfact, energy;
-+            
-+    /* Packet Loss */
-+
-+    if (PLI == 1) {
-+        
-+        iLBCdec_inst->consPLICount += 1;
-+        
-+        /* if previous frame not lost, 
-+           determine pitch pred. gain */
-+        
-+        if (iLBCdec_inst->prevPLI != 1) {
-+
-+            /* Search around the previous lag to find the 
-+               best pitch period */
-+            
-+            lag=inlag-3;
-+            compCorr(&maxcc, &gain, &max_per, 
-+                iLBCdec_inst->prevResidual,
-+                lag, iLBCdec_inst->blockl, 60);
-+            for (i=inlag-2;i<=inlag+3;i++) {
-+                compCorr(&maxcc_comp, &gain_comp, &per,
-+                    iLBCdec_inst->prevResidual,
-+                    i, iLBCdec_inst->blockl, 60);
-+                
-+                if (maxcc_comp>maxcc) {
-+                    maxcc=maxcc_comp;
-+                    gain=gain_comp;
-+                    lag=i;
-+                    max_per=per;
-+                }
-+            }
-+            
-+        }
-+
-+        /* previous frame lost, use recorded lag and periodicity */
-+
-+        else {
-+            lag=iLBCdec_inst->prevLag;
-+            max_per=iLBCdec_inst->per;
-+        }
-+        
-+        /* downscaling */
-+
-+        use_gain=1.0;
-+        if (iLBCdec_inst->consPLICount*iLBCdec_inst->blockl>320)
-+            use_gain=(float)0.9;
-+        else if (iLBCdec_inst->consPLICount*
-+                        iLBCdec_inst->blockl>2*320)
-+            use_gain=(float)0.7;
-+        else if (iLBCdec_inst->consPLICount*
-+                        iLBCdec_inst->blockl>3*320)
-+            use_gain=(float)0.5;
-+        else if (iLBCdec_inst->consPLICount*
-+
-+
-+                        iLBCdec_inst->blockl>4*320)
-+            use_gain=(float)0.0;
-+
-+        /* mix noise and pitch repeatition */
-+        ftmp=(float)sqrt(max_per);
-+        if (ftmp>(float)0.7)
-+            pitchfact=(float)1.0;
-+        else if (ftmp>(float)0.4)
-+            pitchfact=(ftmp-(float)0.4)/((float)0.7-(float)0.4);
-+        else
-+            pitchfact=0.0;
-+
-+
-+        /* avoid repetition of same pitch cycle */
-+        use_lag=lag;
-+        if (lag<80) {
-+            use_lag=2*lag;
-+        }
-+
-+        /* compute concealed residual */
-+
-+        energy = 0.0;
-+        for (i=0; i<iLBCdec_inst->blockl; i++) {
-+
-+            /* noise component */
-+
-+            iLBCdec_inst->seed=(iLBCdec_inst->seed*69069L+1) & 
-+                (0x80000000L-1);
-+            randlag = 50 + ((signed long) iLBCdec_inst->seed)%70;
-+            pick = i - randlag;
-+            
-+            if (pick < 0) {
-+                randvec[i] = 
-+                    iLBCdec_inst->prevResidual[
-+                                iLBCdec_inst->blockl+pick];
-+            } else {
-+                randvec[i] =  randvec[pick];
-+            }
-+
-+            /* pitch repeatition component */
-+            pick = i - use_lag;
-+            
-+            if (pick < 0) {
-+                PLCresidual[i] =  
-+                    iLBCdec_inst->prevResidual[
-+                                iLBCdec_inst->blockl+pick];
-+            } else {
-+                PLCresidual[i] = PLCresidual[pick];
-+            }
-+
-+            /* mix random and periodicity component */
-+
-+            if (i<80)
-+                PLCresidual[i] = use_gain*(pitchfact * 
-+
-+
-+                            PLCresidual[i] +
-+                            ((float)1.0 - pitchfact) * randvec[i]);
-+            else if (i<160)
-+                PLCresidual[i] = (float)0.95*use_gain*(pitchfact * 
-+                            PLCresidual[i] +
-+                            ((float)1.0 - pitchfact) * randvec[i]);
-+            else
-+                PLCresidual[i] = (float)0.9*use_gain*(pitchfact * 
-+                            PLCresidual[i] +
-+                            ((float)1.0 - pitchfact) * randvec[i]);
-+
-+            energy += PLCresidual[i] * PLCresidual[i];
-+        }
-+        
-+        /* less than 30 dB, use only noise */
-+        
-+        if (sqrt(energy/(float)iLBCdec_inst->blockl) < 30.0) { 
-+            gain=0.0;
-+            for (i=0; i<iLBCdec_inst->blockl; i++) {
-+                PLCresidual[i] = randvec[i];
-+            }
-+        }
-+
-+        /* use old LPC */
-+
-+        memcpy(PLClpc,iLBCdec_inst->prevLpc,
-+            (LPC_FILTERORDER+1)*sizeof(float));
-+        
-+    }
-+
-+    /* no packet loss, copy input */
-+
-+    else {
-+        memcpy(PLCresidual, decresidual, 
-+            iLBCdec_inst->blockl*sizeof(float));
-+        memcpy(PLClpc, lpc, (LPC_FILTERORDER+1)*sizeof(float));
-+        iLBCdec_inst->consPLICount = 0;
-+    }
-+    
-+    /* update state */
-+
-+    if (PLI) {
-+        iLBCdec_inst->prevLag = lag;
-+        iLBCdec_inst->per=max_per;
-+    }
-+
-+    iLBCdec_inst->prevPLI = PLI;
-+    memcpy(iLBCdec_inst->prevLpc, PLClpc, 
-+        (LPC_FILTERORDER+1)*sizeof(float));
-+    memcpy(iLBCdec_inst->prevResidual, PLCresidual,
-+        iLBCdec_inst->blockl*sizeof(float));
-+}
-+
-+
-+
-+
-diff -druN codecs/ilbc.orig/doCPLC.h codecs/ilbc/doCPLC.h
---- codecs/ilbc.orig/doCPLC.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/doCPLC.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,32 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    doCPLC.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_DOLPC_H
-+#define __iLBC_DOLPC_H
-+
-+void doThePLC(
-+    float *PLCresidual, /* (o) concealed residual */ 
-+    float *PLClpc,      /* (o) concealed LP parameters */  
-+    int PLI,        /* (i) packet loss indicator 
-+                               0 - no PL, 1 = PL */ 
-+    float *decresidual, /* (i) decoded residual */
-+    float *lpc,         /* (i) decoded LPC (only used for no PL) */
-+    int inlag,          /* (i) pitch lag */
-+    iLBC_Dec_Inst_t *iLBCdec_inst 
-+                        /* (i/o) decoder instance */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/enhancer.c codecs/ilbc/enhancer.c
---- codecs/ilbc.orig/enhancer.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/enhancer.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,665 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    enhancer.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <string.h>
-+#include "iLBC_define.h"
-+#include "enhancer.h"
-+#include "constants.h"
-+#include "filter.h"
-+
-+/*----------------------------------------------------------------*
-+
-+
-+ * Find index in array such that the array element with said
-+ * index is the element of said array closest to "value" 
-+ * according to the squared-error criterion
-+ *---------------------------------------------------------------*/
-+
-+static void NearestNeighbor(
-+    int   *index,   /* (o) index of array element closest 
-+                           to value */
-+    float *array,   /* (i) data array */
-+    float value,/* (i) value */
-+    int arlength/* (i) dimension of data array */
-+){
-+    int i;
-+    float bestcrit,crit;
-+
-+    crit=array[0]-value;
-+    bestcrit=crit*crit;
-+    *index=0;
-+    for (i=1; i<arlength; i++) {
-+        crit=array[i]-value;
-+        crit=crit*crit;
-+        
-+        if (crit<bestcrit) {
-+            bestcrit=crit;
-+            *index=i;
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ * compute cross correlation between sequences
-+ *---------------------------------------------------------------*/
-+
-+static void mycorr1( 
-+    float* corr,    /* (o) correlation of seq1 and seq2 */
-+    float* seq1,    /* (i) first sequence */
-+    int dim1,           /* (i) dimension first seq1 */
-+    const float *seq2,  /* (i) second sequence */
-+    int dim2        /* (i) dimension seq2 */
-+){
-+    int i,j;
-+
-+    for (i=0; i<=dim1-dim2; i++) {
-+        corr[i]=0.0;
-+        for (j=0; j<dim2; j++) {
-+            corr[i] += seq1[i+j] * seq2[j];
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ * upsample finite array assuming zeros outside bounds
-+ *---------------------------------------------------------------*/
-+
-+
-+
-+static void enh_upsample( 
-+    float* useq1,   /* (o) upsampled output sequence */
-+    float* seq1,/* (i) unupsampled sequence */
-+    int dim1,       /* (i) dimension seq1 */
-+    int hfl         /* (i) polyphase filter length=2*hfl+1 */
-+){
-+    float *pu,*ps;
-+    int i,j,k,q,filterlength,hfl2;
-+    const float *polyp[ENH_UPS0]; /* pointers to 
-+                                     polyphase columns */
-+    const float *pp;
-+
-+    /* define pointers for filter */
-+
-+    filterlength=2*hfl+1;
-+    
-+    if ( filterlength > dim1 ) {
-+        hfl2=(int) (dim1/2);
-+        for (j=0; j<ENH_UPS0; j++) {
-+            polyp[j]=polyphaserTbl+j*filterlength+hfl-hfl2;
-+        }
-+        hfl=hfl2;
-+        filterlength=2*hfl+1;
-+    }
-+    else {
-+        for (j=0; j<ENH_UPS0; j++) {
-+            polyp[j]=polyphaserTbl+j*filterlength;
-+        }
-+    }
-+
-+    /* filtering: filter overhangs left side of sequence */
-+
-+    pu=useq1;
-+    for (i=hfl; i<filterlength; i++) { 
-+        for (j=0; j<ENH_UPS0; j++) {
-+            *pu=0.0;
-+            pp = polyp[j];
-+            ps = seq1+i;
-+            for (k=0; k<=i; k++) {
-+                *pu += *ps-- * *pp++;
-+            }
-+            pu++;
-+        }
-+    }
-+
-+    /* filtering: simple convolution=inner products */
-+
-+    for (i=filterlength; i<dim1; i++) {
-+        for (j=0;j<ENH_UPS0; j++){
-+            *pu=0.0;
-+            pp = polyp[j];
-+            ps = seq1+i;
-+            for (k=0; k<filterlength; k++) {
-+                *pu += *ps-- * *pp++;
-+
-+
-+            }
-+            pu++;
-+        }
-+    }
-+
-+    /* filtering: filter overhangs right side of sequence */
-+
-+    for (q=1; q<=hfl; q++) { 
-+        for (j=0; j<ENH_UPS0; j++) {
-+            *pu=0.0;
-+            pp = polyp[j]+q;
-+            ps = seq1+dim1-1;
-+            for (k=0; k<filterlength-q; k++) {
-+                *pu += *ps-- * *pp++;
-+            }
-+            pu++;
-+        }
-+    }
-+}
-+
-+
-+/*----------------------------------------------------------------*
-+ * find segment starting near idata+estSegPos that has highest 
-+ * correlation with idata+centerStartPos through 
-+ * idata+centerStartPos+ENH_BLOCKL-1 segment is found at a 
-+ * resolution of ENH_UPSO times the original of the original 
-+ * sampling rate
-+ *---------------------------------------------------------------*/
-+
-+static void refiner(
-+    float *seg,         /* (o) segment array */
-+    float *updStartPos, /* (o) updated start point */
-+    float* idata,       /* (i) original data buffer */
-+    int idatal,         /* (i) dimension of idata */
-+    int centerStartPos, /* (i) beginning center segment */
-+    float estSegPos,/* (i) estimated beginning other segment */
-+    float period    /* (i) estimated pitch period */
-+){
-+    int estSegPosRounded,searchSegStartPos,searchSegEndPos,corrdim;
-+    int tloc,tloc2,i,st,en,fraction;
-+    float vect[ENH_VECTL],corrVec[ENH_CORRDIM],maxv;
-+    float corrVecUps[ENH_CORRDIM*ENH_UPS0];
-+
-+    /* defining array bounds */
-+    
-+    estSegPosRounded=(int)(estSegPos - 0.5);
-+
-+    searchSegStartPos=estSegPosRounded-ENH_SLOP;
-+    
-+    if (searchSegStartPos<0) { 
-+        searchSegStartPos=0;
-+    }
-+    searchSegEndPos=estSegPosRounded+ENH_SLOP;
-+    
-+
-+
-+    if (searchSegEndPos+ENH_BLOCKL >= idatal) { 
-+        searchSegEndPos=idatal-ENH_BLOCKL-1;
-+    }
-+    corrdim=searchSegEndPos-searchSegStartPos+1;
-+    
-+    /* compute upsampled correlation (corr33) and find 
-+       location of max */
-+
-+    mycorr1(corrVec,idata+searchSegStartPos,
-+        corrdim+ENH_BLOCKL-1,idata+centerStartPos,ENH_BLOCKL);
-+    enh_upsample(corrVecUps,corrVec,corrdim,ENH_FL0);
-+    tloc=0; maxv=corrVecUps[0];
-+    for (i=1; i<ENH_UPS0*corrdim; i++) {
-+        
-+        if (corrVecUps[i]>maxv) {
-+            tloc=i;
-+            maxv=corrVecUps[i];
-+        }
-+    }
-+    
-+    /* make vector can be upsampled without ever running outside 
-+       bounds */
-+    
-+    *updStartPos= (float)searchSegStartPos + 
-+        (float)tloc/(float)ENH_UPS0+(float)1.0;
-+    tloc2=(int)(tloc/ENH_UPS0);
-+    
-+    if (tloc>tloc2*ENH_UPS0) {
-+        tloc2++;
-+    }
-+    st=searchSegStartPos+tloc2-ENH_FL0;
-+    
-+    if (st<0) {
-+        memset(vect,0,-st*sizeof(float));
-+        memcpy(&vect[-st],idata, (ENH_VECTL+st)*sizeof(float));
-+    }
-+    else {
-+        en=st+ENH_VECTL;
-+        
-+        if (en>idatal) {
-+            memcpy(vect, &idata[st], 
-+                (ENH_VECTL-(en-idatal))*sizeof(float));
-+            memset(&vect[ENH_VECTL-(en-idatal)], 0, 
-+                (en-idatal)*sizeof(float));
-+        }
-+        else {
-+            memcpy(vect, &idata[st], ENH_VECTL*sizeof(float));
-+        }
-+    }
-+    fraction=tloc2*ENH_UPS0-tloc;
-+    
-+    /* compute the segment (this is actually a convolution) */
-+
-+    mycorr1(seg,vect,ENH_VECTL,polyphaserTbl+(2*ENH_FL0+1)*fraction,
-+
-+
-+        2*ENH_FL0+1);
-+}
-+
-+/*----------------------------------------------------------------*
-+ * find the smoothed output data
-+ *---------------------------------------------------------------*/
-+
-+static void smath(
-+    float *odata,   /* (o) smoothed output */
-+    float *sseq,/* (i) said second sequence of waveforms */
-+    int hl,         /* (i) 2*hl+1 is sseq dimension */
-+    float alpha0/* (i) max smoothing energy fraction */
-+){
-+    int i,k;
-+    float w00,w10,w11,A,B,C,*psseq,err,errs;
-+    float surround[BLOCKL_MAX]; /* shape contributed by other than 
-+                                   current */
-+    float wt[2*ENH_HL+1];       /* waveform weighting to get 
-+                                   surround shape */
-+    float denom;
-+    
-+    /* create shape of contribution from all waveforms except the
-+       current one */
-+
-+    for (i=1; i<=2*hl+1; i++) {
-+        wt[i-1] = (float)0.5*(1 - (float)cos(2*PI*i/(2*hl+2))); 
-+    }
-+    wt[hl]=0.0; /* for clarity, not used */
-+    for (i=0; i<ENH_BLOCKL; i++) {
-+        surround[i]=sseq[i]*wt[0];
-+    }
-+    for (k=1; k<hl; k++) {
-+        psseq=sseq+k*ENH_BLOCKL;
-+        for(i=0;i<ENH_BLOCKL; i++) {
-+            surround[i]+=psseq[i]*wt[k];
-+        }
-+    }
-+    for (k=hl+1; k<=2*hl; k++) {
-+        psseq=sseq+k*ENH_BLOCKL;
-+        for(i=0;i<ENH_BLOCKL; i++) {
-+            surround[i]+=psseq[i]*wt[k];
-+        }
-+    }
-+    
-+    /* compute some inner products */
-+
-+    w00 = w10 = w11 = 0.0;
-+    psseq=sseq+hl*ENH_BLOCKL; /* current block  */
-+    for (i=0; i<ENH_BLOCKL;i++) {
-+        w00+=psseq[i]*psseq[i];
-+        w11+=surround[i]*surround[i];
-+        w10+=surround[i]*psseq[i];
-+    }
-+    
-+
-+
-+    if (fabs(w11) < 1.0) {
-+        w11=1.0;
-+    }
-+    C = (float)sqrt( w00/w11);
-+    
-+    /* first try enhancement without power-constraint */
-+
-+    errs=0.0;
-+    psseq=sseq+hl*ENH_BLOCKL;
-+    for (i=0; i<ENH_BLOCKL; i++) {
-+        odata[i]=C*surround[i];
-+        err=psseq[i]-odata[i];
-+        errs+=err*err;
-+    }
-+    
-+    /* if constraint violated by first try, add constraint */ 
-+    
-+    if (errs > alpha0 * w00) {
-+        if ( w00 < 1) {
-+            w00=1;
-+        }
-+        denom = (w11*w00-w10*w10)/(w00*w00);
-+        
-+        if (denom > 0.0001) { /* eliminates numerical problems 
-+                                 for if smooth */
-+            A = (float)sqrt( (alpha0- alpha0*alpha0/4)/denom);
-+            B = -alpha0/2 - A * w10/w00;
-+            B = B+1;
-+        }
-+        else { /* essentially no difference between cycles; 
-+                  smoothing not needed */
-+            A= 0.0;
-+            B= 1.0;
-+        }
-+        
-+        /* create smoothed sequence */
-+
-+        psseq=sseq+hl*ENH_BLOCKL;
-+        for (i=0; i<ENH_BLOCKL; i++) {
-+            odata[i]=A*surround[i]+B*psseq[i];
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ * get the pitch-synchronous sample sequence
-+ *---------------------------------------------------------------*/
-+
-+static void getsseq(
-+    float *sseq,    /* (o) the pitch-synchronous sequence */
-+    float *idata,       /* (i) original data */
-+    int idatal,         /* (i) dimension of data */
-+    int centerStartPos, /* (i) where current block starts */
-+    float *period,      /* (i) rough-pitch-period array */
-+
-+
-+    float *plocs,       /* (i) where periods of period array 
-+                               are taken */
-+    int periodl,    /* (i) dimension period array */
-+    int hl              /* (i) 2*hl+1 is the number of sequences */
-+){
-+    int i,centerEndPos,q;
-+    float blockStartPos[2*ENH_HL+1];
-+    int lagBlock[2*ENH_HL+1];
-+    float plocs2[ENH_PLOCSL]; 
-+    float *psseq;
-+
-+    centerEndPos=centerStartPos+ENH_BLOCKL-1;
-+    
-+    /* present */
-+
-+    NearestNeighbor(lagBlock+hl,plocs,
-+        (float)0.5*(centerStartPos+centerEndPos),periodl);
-+    
-+    blockStartPos[hl]=(float)centerStartPos;
-+    psseq=sseq+ENH_BLOCKL*hl;
-+    memcpy(psseq, idata+centerStartPos, ENH_BLOCKL*sizeof(float));
-+    
-+    /* past */
-+
-+    for (q=hl-1; q>=0; q--) {
-+        blockStartPos[q]=blockStartPos[q+1]-period[lagBlock[q+1]];
-+        NearestNeighbor(lagBlock+q,plocs,
-+            blockStartPos[q]+
-+            ENH_BLOCKL_HALF-period[lagBlock[q+1]], periodl);
-+                            
-+        
-+        if (blockStartPos[q]-ENH_OVERHANG>=0) {
-+            refiner(sseq+q*ENH_BLOCKL, blockStartPos+q, idata,
-+                idatal, centerStartPos, blockStartPos[q],
-+                period[lagBlock[q+1]]);
-+        } else {
-+            psseq=sseq+q*ENH_BLOCKL;
-+            memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-+        }
-+    }
-+    
-+    /* future */
-+
-+    for (i=0; i<periodl; i++) {
-+        plocs2[i]=plocs[i]-period[i];
-+    }
-+    for (q=hl+1; q<=2*hl; q++) { 
-+        NearestNeighbor(lagBlock+q,plocs2,
-+            blockStartPos[q-1]+ENH_BLOCKL_HALF,periodl);
-+
-+        blockStartPos[q]=blockStartPos[q-1]+period[lagBlock[q]];
-+        if (blockStartPos[q]+ENH_BLOCKL+ENH_OVERHANG<idatal) {
-+            refiner(sseq+ENH_BLOCKL*q, blockStartPos+q, idata,
-+                idatal, centerStartPos, blockStartPos[q],
-+
-+
-+                period[lagBlock[q]]);
-+        }
-+        else {
-+            psseq=sseq+q*ENH_BLOCKL;
-+            memset(psseq, 0, ENH_BLOCKL*sizeof(float));
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ * perform enhancement on idata+centerStartPos through 
-+ * idata+centerStartPos+ENH_BLOCKL-1
-+ *---------------------------------------------------------------*/
-+
-+static void enhancer(
-+    float *odata,       /* (o) smoothed block, dimension blockl */
-+    float *idata,       /* (i) data buffer used for enhancing */
-+    int idatal,         /* (i) dimension idata */
-+    int centerStartPos, /* (i) first sample current block 
-+                               within idata */
-+    float alpha0,       /* (i) max correction-energy-fraction 
-+                              (in [0,1]) */
-+    float *period,      /* (i) pitch period array */
-+    float *plocs,       /* (i) locations where period array 
-+                               values valid */
-+    int periodl         /* (i) dimension of period and plocs */
-+){
-+    float sseq[(2*ENH_HL+1)*ENH_BLOCKL];
-+
-+    /* get said second sequence of segments */
-+
-+    getsseq(sseq,idata,idatal,centerStartPos,period,
-+        plocs,periodl,ENH_HL);
-+
-+    /* compute the smoothed output from said second sequence */
-+
-+    smath(odata,sseq,ENH_HL,alpha0);
-+
-+}
-+
-+/*----------------------------------------------------------------*
-+ * cross correlation
-+ *---------------------------------------------------------------*/
-+
-+float xCorrCoef( 
-+    float *target,      /* (i) first array */
-+    float *regressor,   /* (i) second array */
-+    int subl        /* (i) dimension arrays */
-+){
-+    int i;
-+    float ftmp1, ftmp2;
-+        
-+    ftmp1 = 0.0;
-+    ftmp2 = 0.0;
-+
-+
-+    for (i=0; i<subl; i++) {
-+        ftmp1 += target[i]*regressor[i];
-+        ftmp2 += regressor[i]*regressor[i]; 
-+    }
-+    
-+    if (ftmp1 > 0.0) {
-+        return (float)(ftmp1*ftmp1/ftmp2);
-+    }
-+    else {
-+        return (float)0.0;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ * interface for enhancer
-+ *---------------------------------------------------------------*/
-+
-+int enhancerInterface(
-+    float *out,                     /* (o) enhanced signal */
-+    float *in,                      /* (i) unenhanced signal */
-+    iLBC_Dec_Inst_t *iLBCdec_inst   /* (i) buffers etc */
-+){
-+    float *enh_buf, *enh_period;
-+    int iblock, isample;
-+    int lag=0, ilag, i, ioffset;
-+    float cc, maxcc;
-+    float ftmp1, ftmp2;
-+    float *inPtr, *enh_bufPtr1, *enh_bufPtr2;
-+    float plc_pred[ENH_BLOCKL];
-+
-+    float lpState[6], downsampled[(ENH_NBLOCKS*ENH_BLOCKL+120)/2];
-+    int inLen=ENH_NBLOCKS*ENH_BLOCKL+120;
-+    int start, plc_blockl, inlag;
-+
-+    enh_buf=iLBCdec_inst->enh_buf;
-+    enh_period=iLBCdec_inst->enh_period;
-+    
-+    memmove(enh_buf, &enh_buf[iLBCdec_inst->blockl], 
-+        (ENH_BUFL-iLBCdec_inst->blockl)*sizeof(float));
-+                                                            
-+    memcpy(&enh_buf[ENH_BUFL-iLBCdec_inst->blockl], in, 
-+        iLBCdec_inst->blockl*sizeof(float));
-+
-+    if (iLBCdec_inst->mode==30)
-+        plc_blockl=ENH_BLOCKL;
-+    else
-+        plc_blockl=40;
-+
-+    /* when 20 ms frame, move processing one block */
-+    ioffset=0;
-+    if (iLBCdec_inst->mode==20) ioffset=1;
-+
-+    i=3-ioffset;
-+    memmove(enh_period, &enh_period[i], 
-+
-+
-+        (ENH_NBLOCKS_TOT-i)*sizeof(float));
-+
-+    /* Set state information to the 6 samples right before 
-+       the samples to be downsampled. */
-+
-+    memcpy(lpState, 
-+        enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-126, 
-+        6*sizeof(float));
-+
-+    /* Down sample a factor 2 to save computations */
-+
-+    DownSample(enh_buf+(ENH_NBLOCKS_EXTRA+ioffset)*ENH_BLOCKL-120,
-+                lpFilt_coefsTbl, inLen-ioffset*ENH_BLOCKL,
-+                lpState, downsampled);
-+
-+    /* Estimate the pitch in the down sampled domain. */
-+    for (iblock = 0; iblock<ENH_NBLOCKS-ioffset; iblock++) {
-+        
-+        lag = 10;
-+        maxcc = xCorrCoef(downsampled+60+iblock*
-+            ENH_BLOCKL_HALF, downsampled+60+iblock*
-+            ENH_BLOCKL_HALF-lag, ENH_BLOCKL_HALF);
-+        for (ilag=11; ilag<60; ilag++) {
-+            cc = xCorrCoef(downsampled+60+iblock*
-+                ENH_BLOCKL_HALF, downsampled+60+iblock*
-+                ENH_BLOCKL_HALF-ilag, ENH_BLOCKL_HALF);
-+            
-+            if (cc > maxcc) {
-+                maxcc = cc;
-+                lag = ilag;
-+            }
-+        }
-+
-+        /* Store the estimated lag in the non-downsampled domain */
-+        enh_period[iblock+ENH_NBLOCKS_EXTRA+ioffset] = (float)lag*2;
-+
-+
-+    }   
-+
-+
-+    /* PLC was performed on the previous packet */
-+    if (iLBCdec_inst->prev_enh_pl==1) {
-+
-+        inlag=(int)enh_period[ENH_NBLOCKS_EXTRA+ioffset];
-+
-+        lag = inlag-1;
-+        maxcc = xCorrCoef(in, in+lag, plc_blockl);
-+        for (ilag=inlag; ilag<=inlag+1; ilag++) {
-+            cc = xCorrCoef(in, in+ilag, plc_blockl);
-+            
-+            if (cc > maxcc) {
-+                maxcc = cc;
-+                lag = ilag;
-+            }
-+        }
-+
-+
-+
-+        enh_period[ENH_NBLOCKS_EXTRA+ioffset-1]=(float)lag;
-+
-+        /* compute new concealed residual for the old lookahead,
-+           mix the forward PLC with a backward PLC from 
-+           the new frame */
-+        
-+        inPtr=&in[lag-1];
-+        
-+        enh_bufPtr1=&plc_pred[plc_blockl-1];
-+        
-+        if (lag>plc_blockl) {
-+            start=plc_blockl;
-+        } else {
-+            start=lag;
-+        }
-+
-+        for (isample = start; isample>0; isample--) {
-+            *enh_bufPtr1-- = *inPtr--;
-+        }
-+        
-+        enh_bufPtr2=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-+        for (isample = (plc_blockl-1-lag); isample>=0; isample--) 
-+{
-+            *enh_bufPtr1-- = *enh_bufPtr2--;
-+        }
-+
-+        /* limit energy change */
-+        ftmp2=0.0;
-+        ftmp1=0.0;
-+        for (i=0;i<plc_blockl;i++) {
-+            ftmp2+=enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i]*
-+                enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl-i];
-+            ftmp1+=plc_pred[i]*plc_pred[i];
-+        }
-+        ftmp1=(float)sqrt(ftmp1/(float)plc_blockl);
-+        ftmp2=(float)sqrt(ftmp2/(float)plc_blockl);
-+        if (ftmp1>(float)2.0*ftmp2 && ftmp1>0.0) {
-+            for (i=0;i<plc_blockl-10;i++) {
-+                plc_pred[i]*=(float)2.0*ftmp2/ftmp1;
-+            }
-+            for (i=plc_blockl-10;i<plc_blockl;i++) {
-+                plc_pred[i]*=(float)(i-plc_blockl+10)*
-+                    ((float)1.0-(float)2.0*ftmp2/ftmp1)/(float)(10)+
-+                    (float)2.0*ftmp2/ftmp1;
-+            }
-+        }
-+    
-+        enh_bufPtr1=&enh_buf[ENH_BUFL-1-iLBCdec_inst->blockl];
-+        for (i=0; i<plc_blockl; i++) {
-+            ftmp1 = (float) (i+1) / (float) (plc_blockl+1);
-+            *enh_bufPtr1 *= ftmp1;
-+            *enh_bufPtr1 += ((float)1.0-ftmp1)*
-+                                plc_pred[plc_blockl-1-i];
-+            enh_bufPtr1--;
-+        }
-+
-+
-+    }
-+
-+    if (iLBCdec_inst->mode==20) {
-+        /* Enhancer with 40 samples delay */
-+        for (iblock = 0; iblock<2; iblock++) {
-+            enhancer(out+iblock*ENH_BLOCKL, enh_buf, 
-+                ENH_BUFL, (5+iblock)*ENH_BLOCKL+40,
-+                ENH_ALPHA0, enh_period, enh_plocsTbl, 
-+                    ENH_NBLOCKS_TOT);
-+        }
-+    } else if (iLBCdec_inst->mode==30) {
-+        /* Enhancer with 80 samples delay */
-+        for (iblock = 0; iblock<3; iblock++) {
-+            enhancer(out+iblock*ENH_BLOCKL, enh_buf, 
-+                ENH_BUFL, (4+iblock)*ENH_BLOCKL,
-+                ENH_ALPHA0, enh_period, enh_plocsTbl, 
-+                    ENH_NBLOCKS_TOT);
-+        }
-+    }
-+
-+    return (lag*2);
-+}
-+
-+
-diff -druN codecs/ilbc.orig/enhancer.h codecs/ilbc/enhancer.h
---- codecs/ilbc.orig/enhancer.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/enhancer.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,33 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    enhancer.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __ENHANCER_H
-+#define __ENHANCER_H
-+
-+#include "iLBC_define.h"
-+
-+float xCorrCoef( 
-+    float *target,      /* (i) first array */
-+    float *regressor,   /* (i) second array */
-+    int subl        /* (i) dimension arrays */
-+);
-+
-+int enhancerInterface(
-+    float *out,         /* (o) the enhanced recidual signal */
-+    float *in,          /* (i) the recidual signal to enhance */
-+    iLBC_Dec_Inst_t *iLBCdec_inst 
-+                        /* (i/o) the decoder state structure */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/filter.c codecs/ilbc/filter.c
---- codecs/ilbc.orig/filter.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/filter.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,168 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    filter.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+
-+
-+#include "iLBC_define.h"
-+#include "filter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  all-pole filter
-+ *---------------------------------------------------------------*/
-+
-+void AllPoleFilter(
-+    float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to 
-+                           InOut[-1] contain the state of the 
-+                           filter (delayed samples). InOut[0] to 
-+                           InOut[lengthInOut-1] contain the filter
-+                           input, on en exit InOut[-orderCoef] to
-+                           InOut[-1] is unchanged and InOut[0] to
-+                           InOut[lengthInOut-1] contain filtered 
-+                           samples */
-+    float *Coef,/* (i) filter coefficients, Coef[0] is assumed 
-+                           to be 1.0 */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef   /* (i) number of filter coefficients */
-+){  
-+    int n,k;
-+    
-+    for(n=0;n<lengthInOut;n++){
-+        for(k=1;k<=orderCoef;k++){
-+            *InOut -= Coef[k]*InOut[-k];
-+        }
-+        InOut++;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  all-zero filter                         
-+ *---------------------------------------------------------------*/
-+
-+void AllZeroFilter(
-+    float *In,      /* (i) In[0] to In[lengthInOut-1] contain 
-+                           filter input samples */
-+    float *Coef,/* (i) filter coefficients (Coef[0] is assumed 
-+                           to be 1.0) */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef,  /* (i) number of filter coefficients */
-+    float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-+                           contain the filter state, on exit Out[0]
-+                           to Out[lengthInOut-1] contain filtered
-+                           samples */
-+){  
-+    int n,k;
-+    
-+    for(n=0;n<lengthInOut;n++){
-+        *Out = Coef[0]*In[0];
-+        for(k=1;k<=orderCoef;k++){
-+            *Out += Coef[k]*In[-k];
-+        }
-+
-+
-+        Out++;
-+        In++;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  pole-zero filter
-+ *---------------------------------------------------------------*/
-+
-+void ZeroPoleFilter(
-+    float *In,      /* (i) In[0] to In[lengthInOut-1] contain 
-+                           filter input samples In[-orderCoef] to 
-+                           In[-1] contain state of all-zero 
-+                           section */
-+    float *ZeroCoef,/* (i) filter coefficients for all-zero 
-+                           section (ZeroCoef[0] is assumed to 
-+                           be 1.0) */
-+    float *PoleCoef,/* (i) filter coefficients for all-pole section
-+                           (ZeroCoef[0] is assumed to be 1.0) */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef,  /* (i) number of filter coefficients */
-+    float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-+                           contain state of all-pole section. On 
-+                           exit Out[0] to Out[lengthInOut-1] 
-+                           contain filtered samples */
-+){
-+    AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
-+    AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
-+}
-+
-+/*----------------------------------------------------------------*
-+ * downsample (LP filter and decimation)
-+ *---------------------------------------------------------------*/
-+
-+void DownSample (
-+    float  *In,     /* (i) input samples */
-+    float  *Coef,   /* (i) filter coefficients */
-+    int lengthIn,   /* (i) number of input samples */ 
-+    float  *state,  /* (i) filter state */
-+    float  *Out     /* (o) downsampled output */
-+){
-+    float   o;
-+    float *Out_ptr = Out;
-+    float *Coef_ptr, *In_ptr;
-+    float *state_ptr;
-+    int i, j, stop;
-+
-+    /* LP filter and decimate at the same time */
-+
-+    for (i = DELAY_DS; i < lengthIn; i+=FACTOR_DS)
-+    {
-+        Coef_ptr = &Coef[0];
-+        In_ptr = &In[i];
-+        state_ptr = &state[FILTERORDER_DS-2];
-+
-+
-+
-+        o = (float)0.0;
-+        
-+        stop = (i < FILTERORDER_DS) ? i + 1 : FILTERORDER_DS;
-+
-+        for (j = 0; j < stop; j++) 
-+        {
-+            o += *Coef_ptr++ * (*In_ptr--);
-+        }
-+        for (j = i + 1; j < FILTERORDER_DS; j++) 
-+        {
-+            o += *Coef_ptr++ * (*state_ptr--);
-+        }
-+
-+        *Out_ptr++ = o;
-+    }
-+
-+    /* Get the last part (use zeros as input for the future) */
-+
-+    for (i=(lengthIn+FACTOR_DS); i<(lengthIn+DELAY_DS); 
-+            i+=FACTOR_DS) {
-+
-+        o=(float)0.0;
-+        
-+        if (i<lengthIn) {
-+            Coef_ptr = &Coef[0];
-+            In_ptr = &In[i];
-+            for (j=0; j<FILTERORDER_DS; j++) {
-+                    o += *Coef_ptr++ * (*Out_ptr--);
-+            }
-+        } else {
-+            Coef_ptr = &Coef[i-lengthIn];
-+            In_ptr = &In[lengthIn-1];
-+            for (j=0; j<FILTERORDER_DS-(i-lengthIn); j++) {
-+                    o += *Coef_ptr++ * (*In_ptr--);
-+            }
-+        }
-+        *Out_ptr++ = o;
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/filter.h codecs/ilbc/filter.h
---- codecs/ilbc.orig/filter.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/filter.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,73 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    filter.h
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_FILTER_H
-+#define __iLBC_FILTER_H
-+
-+void AllPoleFilter(
-+    float *InOut,   /* (i/o) on entrance InOut[-orderCoef] to 
-+                           InOut[-1] contain the state of the 
-+                           filter (delayed samples). InOut[0] to 
-+                           InOut[lengthInOut-1] contain the filter 
-+                           input, on en exit InOut[-orderCoef] to 
-+                           InOut[-1] is unchanged and InOut[0] to 
-+                           InOut[lengthInOut-1] contain filtered 
-+                           samples */
-+    float *Coef,/* (i) filter coefficients, Coef[0] is assumed 
-+                           to be 1.0 */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef   /* (i) number of filter coefficients */
-+);
-+
-+
-+
-+void AllZeroFilter(
-+    float *In,      /* (i) In[0] to In[lengthInOut-1] contain 
-+                           filter input samples */
-+    float *Coef,/* (i) filter coefficients (Coef[0] is assumed 
-+                           to be 1.0) */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef,  /* (i) number of filter coefficients */
-+    float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-+                           contain the filter state, on exit Out[0] 
-+                           to Out[lengthInOut-1] contain filtered 
-+                           samples */
-+);
-+
-+void ZeroPoleFilter(
-+    float *In,      /* (i) In[0] to In[lengthInOut-1] contain filter
-+                           input samples In[-orderCoef] to In[-1] 
-+                           contain state of all-zero section */
-+    float *ZeroCoef,/* (i) filter coefficients for all-zero 
-+                           section (ZeroCoef[0] is assumed to 
-+                           be 1.0) */
-+    float *PoleCoef,/* (i) filter coefficients for all-pole section
-+                           (ZeroCoef[0] is assumed to be 1.0) */
-+    int lengthInOut,/* (i) number of input/output samples */
-+    int orderCoef,  /* (i) number of filter coefficients */
-+    float *Out      /* (i/o) on entrance Out[-orderCoef] to Out[-1]
-+                           contain state of all-pole section. On
-+                           exit Out[0] to Out[lengthInOut-1] 
-+                           contain filtered samples */
-+);
-+
-+void DownSample (
-+    float  *In,     /* (i) input samples */
-+    float  *Coef,   /* (i) filter coefficients */
-+    int lengthIn,   /* (i) number of input samples */ 
-+    float  *state,  /* (i) filter state */
-+    float  *Out     /* (o) downsampled output */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/gainquant.c codecs/ilbc/gainquant.c
---- codecs/ilbc.orig/gainquant.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/gainquant.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,107 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    gainquant.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+
-+
-+******************************************************************/
-+
-+#include <string.h>
-+#include <math.h>
-+#include "constants.h"
-+#include "gainquant.h"
-+#include "filter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  quantizer for the gain in the gain-shape coding of residual
-+ *---------------------------------------------------------------*/
-+
-+float gainquant(/* (o) quantized gain value */
-+    float in,       /* (i) gain value */
-+    float maxIn,/* (i) maximum of gain value */
-+    int cblen,      /* (i) number of quantization indices */
-+    int *index      /* (o) quantization index */
-+){
-+    int i, tindex;
-+    float minmeasure,measure, *cb, scale;
-+
-+    /* ensure a lower bound on the scaling factor */
-+
-+    scale=maxIn;
-+    
-+    if (scale<0.1) {
-+        scale=(float)0.1;
-+    }
-+
-+    /* select the quantization table */
-+    
-+    if (cblen == 8) {
-+        cb = gain_sq3Tbl;
-+    } else if (cblen == 16) {
-+        cb = gain_sq4Tbl;
-+    } else  {
-+        cb = gain_sq5Tbl;
-+    }
-+
-+    /* select the best index in the quantization table */
-+    
-+    minmeasure=10000000.0;
-+    tindex=0;
-+    for (i=0; i<cblen; i++) {
-+        measure=(in-scale*cb[i])*(in-scale*cb[i]);
-+        
-+        if (measure<minmeasure) {
-+            tindex=i;
-+            minmeasure=measure;
-+        }
-+    }
-+    *index=tindex;
-+       
-+    /* return the quantized value */
-+    
-+
-+
-+    return scale*cb[tindex];
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  decoder for quantized gains in the gain-shape coding of 
-+ *  residual                          
-+ *---------------------------------------------------------------*/
-+
-+float gaindequant(  /* (o) quantized gain value */
-+    int index,      /* (i) quantization index */
-+    float maxIn,/* (i) maximum of unquantized gain */
-+    int cblen       /* (i) number of quantization indices */
-+){
-+    float scale;
-+
-+    /* obtain correct scale factor */
-+
-+    scale=(float)fabs(maxIn);
-+    
-+    if (scale<0.1) {
-+        scale=(float)0.1;
-+    }
-+
-+    /* select the quantization table and return the decoded value */
-+
-+    if (cblen==8) {
-+        return scale*gain_sq3Tbl[index];
-+    } else if (cblen==16) {
-+        return scale*gain_sq4Tbl[index];
-+    }
-+    else if (cblen==32) {
-+        return scale*gain_sq5Tbl[index];
-+    }
-+
-+    return 0.0;
-+}
-+
-+
-diff -druN codecs/ilbc.orig/gainquant.h codecs/ilbc/gainquant.h
---- codecs/ilbc.orig/gainquant.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/gainquant.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,31 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    gainquant.h                                         
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_GAINQUANT_H
-+#define __iLBC_GAINQUANT_H
-+
-+float gainquant(/* (o) quantized gain value */
-+    float in,       /* (i) gain value */
-+    float maxIn,/* (i) maximum of gain value */
-+    int cblen,      /* (i) number of quantization indices */
-+    int *index      /* (o) quantization index */
-+);
-+
-+float gaindequant(  /* (o) quantized gain value */
-+    int index,      /* (i) quantization index */
-+    float maxIn,/* (i) maximum of unquantized gain */
-+    int cblen       /* (i) number of quantization indices */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/getCBvec.c codecs/ilbc/getCBvec.c
---- codecs/ilbc.orig/getCBvec.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/getCBvec.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,181 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    getCBvec.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "iLBC_define.h"
-+#include "getCBvec.h"
-+#include "constants.h"
-+#include <string.h>
-+
-+/*----------------------------------------------------------------*
-+ *  Construct codebook vector for given index.
-+ *---------------------------------------------------------------*/
-+
-+void getCBvec(
-+    float *cbvec,   /* (o) Constructed codebook vector */
-+    float *mem,     /* (i) Codebook buffer */
-+    int index,      /* (i) Codebook index */
-+    int lMem,       /* (i) Length of codebook buffer */
-+    int cbveclen/* (i) Codebook vector length */
-+){
-+    int j, k, n, memInd, sFilt;
-+    float tmpbuf[CB_MEML];
-+    int base_size;
-+    int ilow, ihigh;
-+    float alfa, alfa1;
-+
-+    /* Determine size of codebook sections */
-+
-+    base_size=lMem-cbveclen+1;
-+    
-+    if (cbveclen==SUBL) {
-+        base_size+=cbveclen/2;
-+    }
-+
-+    /* No filter -> First codebook section */
-+
-+
-+    
-+    if (index<lMem-cbveclen+1) {
-+
-+        /* first non-interpolated vectors */
-+
-+        k=index+cbveclen;
-+        /* get vector */
-+        memcpy(cbvec, mem+lMem-k, cbveclen*sizeof(float));
-+
-+    } else if (index < base_size) {
-+
-+        k=2*(index-(lMem-cbveclen+1))+cbveclen;
-+    
-+        ihigh=k/2;
-+        ilow=ihigh-5;
-+
-+        /* Copy first noninterpolated part */
-+
-+        memcpy(cbvec, mem+lMem-k/2, ilow*sizeof(float));
-+
-+        /* interpolation */
-+
-+        alfa1=(float)0.2;
-+        alfa=0.0;
-+        for (j=ilow; j<ihigh; j++) {
-+            cbvec[j]=((float)1.0-alfa)*mem[lMem-k/2+j]+
-+                alfa*mem[lMem-k+j];
-+            alfa+=alfa1;
-+        }
-+
-+        /* Copy second noninterpolated part */
-+
-+        memcpy(cbvec+ihigh, mem+lMem-k+ihigh, 
-+            (cbveclen-ihigh)*sizeof(float));
-+
-+    }
-+
-+    /* Higher codebbok section based on filtering */
-+
-+    else {
-+
-+        /* first non-interpolated vectors */
-+
-+        if (index-base_size<lMem-cbveclen+1) {
-+            float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-+            float *pos;
-+            float *pp, *pp1;
-+
-+            memset(tempbuff2, 0,
-+                CB_HALFFILTERLEN*sizeof(float));
-+            memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-+                lMem*sizeof(float));
-+            memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-+                (CB_HALFFILTERLEN+1)*sizeof(float));
-+
-+
-+
-+            k=index-base_size+cbveclen;
-+            sFilt=lMem-k;
-+            memInd=sFilt+1-CB_HALFFILTERLEN;
-+
-+            /* do filtering */
-+            pos=cbvec;
-+            memset(pos, 0, cbveclen*sizeof(float));
-+            for (n=0; n<cbveclen; n++) {
-+                pp=&tempbuff2[memInd+n+CB_HALFFILTERLEN];
-+                pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-+                for (j=0; j<CB_FILTERLEN; j++) {
-+                    (*pos)+=(*pp++)*(*pp1--);
-+                }
-+                pos++;
-+            }
-+        }
-+
-+        /* interpolated vectors */
-+
-+        else {
-+            float tempbuff2[CB_MEML+CB_FILTERLEN+1];
-+
-+            float *pos;
-+            float *pp, *pp1;
-+            int i;
-+
-+            memset(tempbuff2, 0,
-+                CB_HALFFILTERLEN*sizeof(float));
-+            memcpy(&tempbuff2[CB_HALFFILTERLEN], mem,
-+                lMem*sizeof(float));
-+            memset(&tempbuff2[lMem+CB_HALFFILTERLEN], 0,
-+                (CB_HALFFILTERLEN+1)*sizeof(float));
-+
-+            k=2*(index-base_size-
-+                (lMem-cbveclen+1))+cbveclen;
-+            sFilt=lMem-k;
-+            memInd=sFilt+1-CB_HALFFILTERLEN;
-+
-+            /* do filtering */
-+            pos=&tmpbuf[sFilt];
-+            memset(pos, 0, k*sizeof(float));
-+            for (i=0; i<k; i++) {
-+                pp=&tempbuff2[memInd+i+CB_HALFFILTERLEN];
-+                pp1=&cbfiltersTbl[CB_FILTERLEN-1];
-+                for (j=0; j<CB_FILTERLEN; j++) {
-+                    (*pos)+=(*pp++)*(*pp1--);
-+                }
-+                pos++;
-+            }
-+
-+            ihigh=k/2;
-+            ilow=ihigh-5;
-+
-+
-+
-+            /* Copy first noninterpolated part */
-+
-+            memcpy(cbvec, tmpbuf+lMem-k/2, 
-+                ilow*sizeof(float));
-+
-+            /* interpolation */
-+
-+            alfa1=(float)0.2;
-+            alfa=0.0;
-+            for (j=ilow; j<ihigh; j++) {
-+                cbvec[j]=((float)1.0-alfa)*
-+                    tmpbuf[lMem-k/2+j]+alfa*tmpbuf[lMem-k+j];
-+                alfa+=alfa1;
-+            }
-+
-+            /* Copy second noninterpolated part */
-+
-+            memcpy(cbvec+ihigh, tmpbuf+lMem-k+ihigh, 
-+                (cbveclen-ihigh)*sizeof(float));
-+        }
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/getCBvec.h codecs/ilbc/getCBvec.h
---- codecs/ilbc.orig/getCBvec.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/getCBvec.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,28 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    getCBvec.h                 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_GETCBVEC_H
-+#define __iLBC_GETCBVEC_H
-+
-+
-+
-+void getCBvec(
-+    float *cbvec,   /* (o) Constructed codebook vector */
-+    float *mem,     /* (i) Codebook buffer */
-+    int index,      /* (i) Codebook index */
-+    int lMem,       /* (i) Length of codebook buffer */
-+    int cbveclen/* (i) Codebook vector length */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/helpfun.c codecs/ilbc/helpfun.c
---- codecs/ilbc.orig/helpfun.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/helpfun.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,308 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    helpfun.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+
-+#include "iLBC_define.h"
-+#include "helpfun.h"
-+#include "constants.h"
-+
-+/*----------------------------------------------------------------*
-+ *  calculation of auto correlation 
-+ *---------------------------------------------------------------*/
-+
-+void autocorr( 
-+    float *r,       /* (o) autocorrelation vector */
-+    const float *x, /* (i) data vector */
-+    int N,          /* (i) length of data vector */
-+    int order       /* largest lag for calculated 
-+                       autocorrelations */
-+){
-+    int     lag, n;
-+    float   sum;
-+    
-+    for (lag = 0; lag <= order; lag++) {
-+        sum = 0;
-+        for (n = 0; n < N - lag; n++) {
-+            sum += x[n] * x[n+lag];
-+        }
-+        r[lag] = sum;
-+    }
-+}
-+
-+
-+
-+/*----------------------------------------------------------------*
-+ *  window multiplication  
-+ *---------------------------------------------------------------*/
-+
-+void window( 
-+    float *z,       /* (o) the windowed data */
-+    const float *x, /* (i) the original data vector */
-+    const float *y, /* (i) the window */
-+    int N           /* (i) length of all vectors */
-+){
-+    int     i;
-+    
-+    for (i = 0; i < N; i++) {
-+        z[i] = x[i] * y[i];
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  levinson-durbin solution for lpc coefficients
-+ *---------------------------------------------------------------*/
-+
-+void levdurb( 
-+    float *a,       /* (o) lpc coefficient vector starting 
-+                           with 1.0 */
-+    float *k,       /* (o) reflection coefficients */
-+    float *r,       /* (i) autocorrelation vector */
-+    int order       /* (i) order of lpc filter */
-+){
-+    float  sum, alpha;
-+    int     m, m_h, i;
-+
-+    a[0] = 1.0;
-+    
-+    if (r[0] < EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
-+        for (i = 0; i < order; i++) {
-+            k[i] = 0;
-+            a[i+1] = 0;
-+        }   
-+    } else {
-+        a[1] = k[0] = -r[1]/r[0];
-+        alpha = r[0] + r[1] * k[0];
-+        for (m = 1; m < order; m++){
-+            sum = r[m + 1];
-+            for (i = 0; i < m; i++){
-+                sum += a[i+1] * r[m - i];
-+            }
-+            k[m] = -sum / alpha;
-+            alpha += k[m] * sum;
-+            m_h = (m + 1) >> 1;
-+            for (i = 0; i < m_h; i++){
-+                sum = a[i+1] + k[m] * a[m - i];
-+                a[m - i] += k[m] * a[i+1];
-+                a[i+1] = sum;
-+
-+
-+            }
-+            a[m+1] = k[m];
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  interpolation between vectors 
-+ *---------------------------------------------------------------*/
-+
-+void interpolate( 
-+    float *out,      /* (o) the interpolated vector */
-+    float *in1,     /* (i) the first vector for the 
-+                           interpolation */
-+    float *in2,     /* (i) the second vector for the 
-+                           interpolation */
-+    float coef,      /* (i) interpolation weights */
-+    int length      /* (i) length of all vectors */
-+){
-+    int i;
-+    float invcoef;
-+
-+    invcoef = (float)1.0 - coef;
-+    for (i = 0; i < length; i++) {
-+        out[i] = coef * in1[i] + invcoef * in2[i];
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  lpc bandwidth expansion                   
-+ *---------------------------------------------------------------*/
-+
-+void bwexpand( 
-+    float *out,      /* (o) the bandwidth expanded lpc 
-+                           coefficients */
-+    float *in,      /* (i) the lpc coefficients before bandwidth 
-+                           expansion */
-+    float coef,     /* (i) the bandwidth expansion factor */
-+    int length      /* (i) the length of lpc coefficient vectors */
-+){
-+    int i;
-+    float  chirp;
-+    
-+    chirp = coef;
-+    
-+    out[0] = in[0];
-+    for (i = 1; i < length; i++) {
-+        out[i] = chirp * in[i];
-+        chirp *= coef;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  vector quantization 
-+
-+
-+ *---------------------------------------------------------------*/
-+
-+void vq( 
-+    float *Xq,      /* (o) the quantized vector */
-+    int *index,     /* (o) the quantization index */
-+    const float *CB,/* (i) the vector quantization codebook */
-+    float *X,       /* (i) the vector to quantize */
-+    int n_cb,       /* (i) the number of vectors in the codebook */
-+    int dim         /* (i) the dimension of all vectors */
-+){
-+    int     i, j;
-+    int     pos, minindex;
-+    float   dist, tmp, mindist;
-+
-+    pos = 0;
-+    mindist = FLOAT_MAX;
-+    minindex = 0;
-+    for (j = 0; j < n_cb; j++) {
-+        dist = X[0] - CB[pos];
-+        dist *= dist;
-+        for (i = 1; i < dim; i++) {
-+            tmp = X[i] - CB[pos + i];
-+            dist += tmp*tmp;
-+        }
-+        
-+        if (dist < mindist) {
-+            mindist = dist;
-+            minindex = j;
-+        }
-+        pos += dim;
-+    }
-+    for (i = 0; i < dim; i++) {
-+        Xq[i] = CB[minindex*dim + i];
-+    }
-+    *index = minindex;
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  split vector quantization 
-+ *---------------------------------------------------------------*/
-+
-+void SplitVQ( 
-+    float *qX,      /* (o) the quantized vector */
-+    int *index,     /* (o) a vector of indexes for all vector
-+                           codebooks in the split */
-+    float *X,       /* (i) the vector to quantize */
-+    const float *CB,/* (i) the quantizer codebook */
-+    int nsplit,     /* the number of vector splits */
-+    const int *dim, /* the dimension of X and qX */
-+    const int *cbsize /* the number of vectors in the codebook */
-+){
-+    int    cb_pos, X_pos, i;
-+    
-+    cb_pos = 0;
-+
-+
-+    X_pos= 0;
-+    for (i = 0; i < nsplit; i++) {
-+        vq(qX + X_pos, index + i, CB + cb_pos, X + X_pos, 
-+            cbsize[i], dim[i]);
-+        X_pos += dim[i];
-+        cb_pos += dim[i] * cbsize[i];
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  scalar quantization 
-+ *---------------------------------------------------------------*/
-+
-+void sort_sq( 
-+    float *xq,      /* (o) the quantized value */
-+    int *index,     /* (o) the quantization index */
-+    float x,    /* (i) the value to quantize */
-+    const float *cb,/* (i) the quantization codebook */
-+    int cb_size      /* (i) the size of the quantization codebook */
-+){
-+    int i;
-+    
-+    if (x <= cb[0]) {
-+        *index = 0;
-+        *xq = cb[0];
-+    } else {
-+        i = 0;
-+        while ((x > cb[i]) && i < cb_size - 1) {
-+            i++;
-+        }
-+        
-+        if (x > ((cb[i] + cb[i - 1])/2)) {
-+            *index = i;
-+            *xq = cb[i];
-+        } else {
-+            *index = i - 1;
-+            *xq = cb[i - 1];
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  check for stability of lsf coefficients
-+ *---------------------------------------------------------------*/
-+
-+int LSF_check(    /* (o) 1 for stable lsf vectors and 0 for
-+                           nonstable ones */
-+    float *lsf,     /* (i) a table of lsf vectors */
-+    int dim,    /* (i) the dimension of each lsf vector */
-+    int NoAn    /* (i) the number of lsf vectors in the 
-+                           table */
-+){
-+    int k,n,m, Nit=2, change=0,pos;
-+    float tmp;
-+
-+
-+    static float eps=(float)0.039; /* 50 Hz */
-+    static float eps2=(float)0.0195;
-+    static float maxlsf=(float)3.14; /* 4000 Hz */
-+    static float minlsf=(float)0.01; /* 0 Hz */
-+    
-+    /* LSF separation check*/
-+
-+    for (n=0; n<Nit; n++) { /* Run through a couple of times */
-+        for (m=0; m<NoAn; m++) { /* Number of analyses per frame */
-+            for (k=0; k<(dim-1); k++) {
-+                pos=m*dim+k;
-+                
-+                if ((lsf[pos+1]-lsf[pos])<eps) {
-+                    
-+                    if (lsf[pos+1]<lsf[pos]) {
-+                        tmp=lsf[pos+1];
-+                        lsf[pos+1]= lsf[pos]+eps2;
-+                        lsf[pos]= lsf[pos+1]-eps2;
-+                    } else {
-+                        lsf[pos]-=eps2;
-+                        lsf[pos+1]+=eps2;
-+                    }
-+                    change=1;
-+                }
-+                
-+                if (lsf[pos]<minlsf) { 
-+                    lsf[pos]=minlsf;
-+                    change=1;
-+                }
-+                
-+                if (lsf[pos]>maxlsf) { 
-+                    lsf[pos]=maxlsf;
-+                    change=1;
-+                }               
-+            }
-+        }
-+    }
-+    
-+    return change;  
-+}
-+
-+
-diff -druN codecs/ilbc.orig/helpfun.h codecs/ilbc/helpfun.h
---- codecs/ilbc.orig/helpfun.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/helpfun.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,101 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    helpfun.h         
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_HELPFUN_H
-+#define __iLBC_HELPFUN_H
-+
-+void autocorr( 
-+    float *r,       /* (o) autocorrelation vector */
-+    const float *x, /* (i) data vector */
-+    int N,          /* (i) length of data vector */
-+    int order       /* largest lag for calculated 
-+                       autocorrelations */
-+);
-+
-+void window( 
-+    float *z,       /* (o) the windowed data */
-+    const float *x, /* (i) the original data vector */
-+    const float *y, /* (i) the window */
-+    int N           /* (i) length of all vectors */
-+);
-+
-+
-+
-+void levdurb( 
-+    float *a,       /* (o) lpc coefficient vector starting 
-+                           with 1.0 */
-+    float *k,       /* (o) reflection coefficients */
-+    float *r,       /* (i) autocorrelation vector */
-+    int order       /* (i) order of lpc filter */
-+);
-+
-+void interpolate( 
-+    float *out,     /* (o) the interpolated vector */
-+    float *in1,     /* (i) the first vector for the 
-+                           interpolation */
-+    float *in2,     /* (i) the second vector for the 
-+                           interpolation */
-+    float coef,     /* (i) interpolation weights */
-+    int length      /* (i) length of all vectors */
-+);
-+           
-+void bwexpand( 
-+    float *out,     /* (o) the bandwidth expanded lpc 
-+                           coefficients */
-+    float *in,      /* (i) the lpc coefficients before bandwidth
-+                           expansion */
-+    float coef,     /* (i) the bandwidth expansion factor */
-+    int length      /* (i) the length of lpc coefficient vectors */
-+);
-+
-+void vq( 
-+    float *Xq,      /* (o) the quantized vector */
-+    int *index,     /* (o) the quantization index */
-+    const float *CB,/* (i) the vector quantization codebook */
-+    float *X,       /* (i) the vector to quantize */
-+    int n_cb,       /* (i) the number of vectors in the codebook */
-+    int dim         /* (i) the dimension of all vectors */
-+);  
-+
-+void SplitVQ( 
-+    float *qX,      /* (o) the quantized vector */
-+    int *index,     /* (o) a vector of indexes for all vector
-+                           codebooks in the split */
-+    float *X,       /* (i) the vector to quantize */
-+    const float *CB,/* (i) the quantizer codebook */
-+    int nsplit,     /* the number of vector splits */
-+    const int *dim, /* the dimension of X and qX */
-+    const int *cbsize /* the number of vectors in the codebook */
-+);
-+
-+
-+void sort_sq( 
-+    float *xq,      /* (o) the quantized value */
-+    int *index,     /* (o) the quantization index */
-+    float x,    /* (i) the value to quantize */
-+    const float *cb,/* (i) the quantization codebook */
-+
-+
-+    int cb_size     /* (i) the size of the quantization codebook */
-+);
-+
-+int LSF_check(      /* (o) 1 for stable lsf vectors and 0 for 
-+                           nonstable ones */
-+    float *lsf,     /* (i) a table of lsf vectors */
-+    int dim,    /* (i) the dimension of each lsf vector */
-+    int NoAn    /* (i) the number of lsf vectors in the 
-+                           table */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/hpInput.c codecs/ilbc/hpInput.c
---- codecs/ilbc.orig/hpInput.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/hpInput.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,60 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    hpInput.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "constants.h"
-+#include "hpInput.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Input high-pass filter                          
-+ *---------------------------------------------------------------*/
-+
-+void hpInput( 
-+    float *In,  /* (i) vector to filter */
-+    int len,    /* (i) length of vector to filter */
-+    float *Out, /* (o) the resulting filtered vector */
-+    float *mem  /* (i/o) the filter state */
-+){
-+    int i;
-+    float *pi, *po;
-+
-+    /* all-zero section*/
-+
-+    pi = &In[0];
-+    po = &Out[0];
-+    for (i=0; i<len; i++) {
-+        *po = hpi_zero_coefsTbl[0] * (*pi);
-+        *po += hpi_zero_coefsTbl[1] * mem[0];
-+        *po += hpi_zero_coefsTbl[2] * mem[1];
-+
-+        mem[1] = mem[0];
-+        mem[0] = *pi;
-+        po++;
-+
-+
-+        pi++;
-+
-+    }
-+
-+    /* all-pole section*/
-+
-+    po = &Out[0];
-+    for (i=0; i<len; i++) {
-+        *po -= hpi_pole_coefsTbl[1] * mem[2];
-+        *po -= hpi_pole_coefsTbl[2] * mem[3];
-+
-+        mem[3] = mem[2];
-+        mem[2] = *po;
-+        po++;
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/hpInput.h codecs/ilbc/hpInput.h
---- codecs/ilbc.orig/hpInput.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/hpInput.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,27 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    hpInput.h        
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+
-+
-+#ifndef __iLBC_HPINPUT_H
-+#define __iLBC_HPINPUT_H
-+
-+void hpInput( 
-+    float *In,  /* (i) vector to filter */
-+    int len,    /* (i) length of vector to filter */
-+    float *Out, /* (o) the resulting filtered vector */
-+    float *mem  /* (i/o) the filter state */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/hpOutput.c codecs/ilbc/hpOutput.c
---- codecs/ilbc.orig/hpOutput.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/hpOutput.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,59 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    hpOutput.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+
-+
-+******************************************************************/
-+
-+#include "constants.h"
-+#include "hpOutput.h"
-+/*----------------------------------------------------------------*
-+ *  Output high-pass filter                          
-+ *---------------------------------------------------------------*/
-+
-+void hpOutput(
-+    float *In,  /* (i) vector to filter */
-+    int len,/* (i) length of vector to filter */
-+    float *Out, /* (o) the resulting filtered vector */
-+    float *mem  /* (i/o) the filter state */
-+){
-+    int i;
-+    float *pi, *po;
-+
-+    /* all-zero section*/
-+
-+    pi = &In[0];
-+    po = &Out[0];
-+    for (i=0; i<len; i++) {
-+        *po = hpo_zero_coefsTbl[0] * (*pi);
-+        *po += hpo_zero_coefsTbl[1] * mem[0];
-+        *po += hpo_zero_coefsTbl[2] * mem[1];
-+
-+        mem[1] = mem[0];
-+        mem[0] = *pi;
-+        po++;
-+        pi++;
-+
-+    }
-+
-+    /* all-pole section*/
-+
-+    po = &Out[0];
-+    for (i=0; i<len; i++) {
-+        *po -= hpo_pole_coefsTbl[1] * mem[2];
-+        *po -= hpo_pole_coefsTbl[2] * mem[3];
-+
-+        mem[3] = mem[2];
-+        mem[2] = *po;
-+        po++;
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/hpOutput.h codecs/ilbc/hpOutput.h
---- codecs/ilbc.orig/hpOutput.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/hpOutput.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,25 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    hpOutput.h       
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_HPOUTPUT_H
-+#define __iLBC_HPOUTPUT_H
-+
-+void hpOutput(
-+    float *In,  /* (i) vector to filter */
-+    int len,/* (i) length of vector to filter */
-+    float *Out, /* (o) the resulting filtered vector */
-+    float *mem  /* (i/o) the filter state */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/iCBConstruct.c codecs/ilbc/iCBConstruct.c
---- codecs/ilbc.orig/iCBConstruct.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iCBConstruct.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,108 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iCBConstruct.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+
-+#include "iLBC_define.h"
-+#include "iCBConstruct.h"
-+#include "gainquant.h"
-+#include "getCBvec.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Convert the codebook indexes to make the search easier
-+ *---------------------------------------------------------------*/
-+
-+
-+
-+void index_conv_enc(
-+    int *index          /* (i/o) Codebook indexes */
-+){
-+    int k;
-+
-+    for (k=1; k<CB_NSTAGES; k++) {
-+        
-+        if ((index[k]>=108)&&(index[k]<172)) {
-+            index[k]-=64;
-+        } else if (index[k]>=236) {
-+            index[k]-=128;
-+        } else {
-+            /* ERROR */
-+        }
-+    }
-+}
-+
-+void index_conv_dec(
-+    int *index          /* (i/o) Codebook indexes */
-+){
-+    int k;
-+
-+    for (k=1; k<CB_NSTAGES; k++) {
-+        
-+        if ((index[k]>=44)&&(index[k]<108)) {
-+            index[k]+=64;
-+        } else if ((index[k]>=108)&&(index[k]<128)) {
-+            index[k]+=128;
-+        } else {
-+            /* ERROR */
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  Construct decoded vector from codebook and gains.
-+ *---------------------------------------------------------------*/
-+
-+void iCBConstruct(
-+    float *decvector,   /* (o) Decoded vector */
-+    int *index,         /* (i) Codebook indices */
-+    int *gain_index,/* (i) Gain quantization indices */
-+    float *mem,         /* (i) Buffer for codevector construction */
-+    int lMem,           /* (i) Length of buffer */
-+    int veclen,         /* (i) Length of vector */
-+    int nStages         /* (i) Number of codebook stages */
-+){
-+    int j,k;
-+    float gain[CB_NSTAGES];
-+    float cbvec[SUBL];
-+
-+    /* gain de-quantization */
-+
-+    gain[0] = gaindequant(gain_index[0], 1.0, 32);
-+
-+
-+    if (nStages > 1) {
-+        gain[1] = gaindequant(gain_index[1], 
-+            (float)fabs(gain[0]), 16);  
-+    }
-+    if (nStages > 2) {
-+        gain[2] = gaindequant(gain_index[2], 
-+            (float)fabs(gain[1]), 8);
-+    }
-+
-+    /* codebook vector construction and construction of 
-+    total vector */
-+
-+    getCBvec(cbvec, mem, index[0], lMem, veclen);
-+    for (j=0;j<veclen;j++){
-+        decvector[j] = gain[0]*cbvec[j];
-+    }
-+    if (nStages > 1) {
-+        for (k=1; k<nStages; k++) {
-+            getCBvec(cbvec, mem, index[k], lMem, veclen);
-+            for (j=0;j<veclen;j++) {
-+                decvector[j] += gain[k]*cbvec[j];
-+            }
-+        }
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/iCBConstruct.h codecs/ilbc/iCBConstruct.h
---- codecs/ilbc.orig/iCBConstruct.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iCBConstruct.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,38 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+
-+
-+    iCBConstruct.h   
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_ICBCONSTRUCT_H
-+#define __iLBC_ICBCONSTRUCT_H
-+
-+void index_conv_enc(
-+    int *index          /* (i/o) Codebook indexes */
-+);
-+
-+void index_conv_dec(
-+    int *index          /* (i/o) Codebook indexes */
-+);
-+
-+void iCBConstruct(
-+    float *decvector,   /* (o) Decoded vector */
-+    int *index,         /* (i) Codebook indices */
-+    int *gain_index,/* (i) Gain quantization indices */
-+    float *mem,         /* (i) Buffer for codevector construction */
-+    int lMem,           /* (i) Length of buffer */
-+    int veclen,         /* (i) Length of vector */
-+    int nStages         /* (i) Number of codebook stages */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/iCBSearch.c codecs/ilbc/iCBSearch.c
---- codecs/ilbc.orig/iCBSearch.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iCBSearch.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,480 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iCBSearch.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <string.h>
-+
-+#include "iLBC_define.h"
-+#include "iCBSearch.h"
-+#include "gainquant.h"
-+#include "createCB.h"
-+#include "filter.h"
-+#include "constants.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Search routine for codebook encoding and gain quantization.
-+ *---------------------------------------------------------------*/
-+
-+void iCBSearch(
-+    iLBC_Enc_Inst_t *iLBCenc_inst, 
-+                        /* (i) the encoder state structure */
-+    int *index,         /* (o) Codebook indices */
-+    int *gain_index,/* (o) Gain quantization indices */
-+    float *intarget,/* (i) Target vector for encoding */    
-+    float *mem,         /* (i) Buffer for codebook construction */
-+    int lMem,           /* (i) Length of buffer */
-+    int lTarget,    /* (i) Length of vector */
-+    int nStages,    /* (i) Number of codebook stages */
-+    float *weightDenum, /* (i) weighting filter coefficients */
-+    float *weightState, /* (i) weighting filter state */
-+    int block           /* (i) the sub-block number */
-+){
-+    int i, j, icount, stage, best_index, range, counter;
-+    float max_measure, gain, measure, crossDot, ftmp;
-+    float gains[CB_NSTAGES];
-+    float target[SUBL];
-+    int base_index, sInd, eInd, base_size;
-+    int sIndAug=0, eIndAug=0;
-+    float buf[CB_MEML+SUBL+2*LPC_FILTERORDER];
-+
-+
-+    float invenergy[CB_EXPAND*128], energy[CB_EXPAND*128];
-+    float *pp, *ppi=0, *ppo=0, *ppe=0;
-+    float cbvectors[CB_MEML];
-+    float tene, cene, cvec[SUBL];
-+    float aug_vec[SUBL];
-+
-+    memset(cvec,0,SUBL*sizeof(float));  
-+
-+    /* Determine size of codebook sections */
-+
-+    base_size=lMem-lTarget+1;
-+    
-+    if (lTarget==SUBL) {
-+        base_size=lMem-lTarget+1+lTarget/2;
-+    }
-+
-+    /* setup buffer for weighting */
-+
-+    memcpy(buf,weightState,sizeof(float)*LPC_FILTERORDER);
-+    memcpy(buf+LPC_FILTERORDER,mem,lMem*sizeof(float));
-+    memcpy(buf+LPC_FILTERORDER+lMem,intarget,lTarget*sizeof(float));
-+
-+    /* weighting */
-+
-+    AllPoleFilter(buf+LPC_FILTERORDER, weightDenum, 
-+        lMem+lTarget, LPC_FILTERORDER);
-+    
-+    /* Construct the codebook and target needed */
-+
-+    memcpy(target, buf+LPC_FILTERORDER+lMem, lTarget*sizeof(float));
-+
-+    tene=0.0;
-+    for (i=0; i<lTarget; i++) {
-+        tene+=target[i]*target[i];
-+    }
-+
-+    /* Prepare search over one more codebook section. This section 
-+       is created by filtering the original buffer with a filter. */
-+        
-+    filteredCBvecs(cbvectors, buf+LPC_FILTERORDER, lMem);
-+
-+    /* The Main Loop over stages */
-+
-+    for (stage=0; stage<nStages; stage++) {
-+
-+        range = search_rangeTbl[block][stage];
-+
-+        /* initialize search measure */
-+
-+        max_measure = (float)-10000000.0;
-+        gain = (float)0.0;
-+        best_index = 0;
-+
-+        /* Compute cross dot product between the target 
-+
-+
-+           and the CB memory */
-+
-+        crossDot=0.0;
-+        pp=buf+LPC_FILTERORDER+lMem-lTarget;
-+        for (j=0; j<lTarget; j++) {
-+            crossDot += target[j]*(*pp++);
-+        }       
-+        
-+        if (stage==0) {
-+
-+            /* Calculate energy in the first block of 
-+              'lTarget' sampels. */
-+            ppe = energy;
-+            ppi = buf+LPC_FILTERORDER+lMem-lTarget-1;
-+            ppo = buf+LPC_FILTERORDER+lMem-1;
-+
-+            *ppe=0.0;
-+            pp=buf+LPC_FILTERORDER+lMem-lTarget;
-+            for (j=0; j<lTarget; j++) {
-+                *ppe+=(*pp)*(*pp);
-+				pp++;
-+            }
-+            
-+            if (*ppe>0.0) {
-+                invenergy[0] = (float) 1.0 / (*ppe + EPS);
-+            } else {
-+                invenergy[0] = (float) 0.0; 
-+            }
-+            ppe++;
-+
-+            measure=(float)-10000000.0; 
-+            
-+            if (crossDot > 0.0) {
-+                   measure = crossDot*crossDot*invenergy[0];
-+            }
-+        }
-+        else {
-+            measure = crossDot*crossDot*invenergy[0];
-+        }
-+
-+        /* check if measure is better */
-+        ftmp = crossDot*invenergy[0];
-+        
-+        if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-+            best_index = 0;
-+            max_measure = measure;
-+            gain = ftmp;
-+        }
-+
-+        /* loop over the main first codebook section, 
-+           full search */
-+
-+        for (icount=1; icount<range; icount++) {
-+
-+            /* calculate measure */
-+
-+
-+
-+            crossDot=0.0;
-+            pp = buf+LPC_FILTERORDER+lMem-lTarget-icount;
-+
-+            for (j=0; j<lTarget; j++) {
-+                crossDot += target[j]*(*pp++);
-+            }
-+            
-+            if (stage==0) {
-+                *ppe++ = energy[icount-1] + (*ppi)*(*ppi) - 
-+                    (*ppo)*(*ppo);
-+                ppo--;
-+                ppi--;
-+                
-+                if (energy[icount]>0.0) {
-+                    invenergy[icount] = 
-+                        (float)1.0/(energy[icount]+EPS);
-+                } else {
-+                    invenergy[icount] = (float) 0.0;
-+                }
-+
-+                measure=(float)-10000000.0;
-+                
-+                if (crossDot > 0.0) {
-+                    measure = crossDot*crossDot*invenergy[icount];
-+                }
-+            }
-+            else {
-+                measure = crossDot*crossDot*invenergy[icount];
-+            }
-+
-+            /* check if measure is better */
-+            ftmp = crossDot*invenergy[icount];
-+
-+            if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-+                best_index = icount;
-+                max_measure = measure;
-+                gain = ftmp;
-+            }
-+        }
-+
-+        /* Loop over augmented part in the first codebook 
-+         * section, full search.
-+         * The vectors are interpolated.
-+         */
-+        
-+        if (lTarget==SUBL) {        
-+            
-+            /* Search for best possible cb vector and 
-+               compute the CB-vectors' energy. */
-+            searchAugmentedCB(20, 39, stage, base_size-lTarget/2, 
-+                target, buf+LPC_FILTERORDER+lMem,
-+                &max_measure, &best_index, &gain, energy, 
-+                invenergy);
-+
-+
-+        }
-+
-+        /* set search range for following codebook sections */
-+
-+        base_index=best_index;
-+
-+        /* unrestricted search */
-+
-+        if (CB_RESRANGE == -1) {
-+            sInd=0;
-+            eInd=range-1;
-+            sIndAug=20;
-+            eIndAug=39;
-+        }
-+
-+        /* restriced search around best index from first 
-+        codebook section */
-+
-+        else {
-+            /* Initialize search indices */
-+            sIndAug=0;
-+            eIndAug=0;
-+            sInd=base_index-CB_RESRANGE/2;
-+            eInd=sInd+CB_RESRANGE;
-+            
-+            if (lTarget==SUBL) {
-+
-+                if (sInd<0) {
-+                    
-+                    sIndAug = 40 + sInd;
-+                    eIndAug = 39;
-+                    sInd=0;
-+
-+                } else if ( base_index < (base_size-20) ) {
-+                    
-+                    if (eInd > range) {
-+                        sInd -= (eInd-range);
-+                        eInd = range;
-+                    }
-+                } else { /* base_index >= (base_size-20) */
-+                    
-+                    if (sInd < (base_size-20)) {
-+                        sIndAug = 20;
-+                        sInd = 0;
-+                        eInd = 0;
-+                        eIndAug = 19 + CB_RESRANGE;
-+                        
-+                        if(eIndAug > 39) {
-+                            eInd = eIndAug-39;
-+                            eIndAug = 39;
-+                        }
-+                    } else {
-+                        sIndAug = 20 + sInd - (base_size-20);
-+                        eIndAug = 39;
-+
-+
-+                        sInd = 0;
-+                        eInd = CB_RESRANGE - (eIndAug-sIndAug+1);
-+                    }
-+                }
-+
-+            } else { /* lTarget = 22 or 23 */
-+                
-+                if (sInd < 0) {
-+                    eInd -= sInd;
-+                    sInd = 0;
-+                }
-+                
-+                if(eInd > range) {
-+                    sInd -= (eInd - range);
-+                    eInd = range;
-+                }
-+            }
-+        }
-+
-+        /* search of higher codebook section */
-+
-+        /* index search range */
-+        counter = sInd;
-+        sInd += base_size;
-+        eInd += base_size;
-+        
-+        
-+        if (stage==0) {
-+            ppe = energy+base_size;
-+            *ppe=0.0;
-+
-+            pp=cbvectors+lMem-lTarget;
-+            for (j=0; j<lTarget; j++) {
-+                *ppe+=(*pp)*(*pp);
-+				pp++;
-+            }
-+
-+            ppi = cbvectors + lMem - 1 - lTarget;
-+            ppo = cbvectors + lMem - 1;
-+            
-+            for (j=0; j<(range-1); j++) {
-+                *(ppe+1) = *ppe + (*ppi)*(*ppi) - (*ppo)*(*ppo);
-+                ppo--;
-+                ppi--;
-+                ppe++;
-+            }
-+        }
-+
-+        /* loop over search range */
-+
-+        for (icount=sInd; icount<eInd; icount++) {
-+
-+            /* calculate measure */
-+
-+            crossDot=0.0;
-+
-+
-+            pp=cbvectors + lMem - (counter++) - lTarget;
-+
-+            for (j=0;j<lTarget;j++) {
-+                crossDot += target[j]*(*pp++);
-+            }
-+            
-+            if (energy[icount]>0.0) {
-+                invenergy[icount] =(float)1.0/(energy[icount]+EPS);
-+            } else {
-+                invenergy[icount] =(float)0.0;
-+            }
-+            
-+            if (stage==0) {
-+
-+                measure=(float)-10000000.0;
-+                
-+                if (crossDot > 0.0) {
-+                    measure = crossDot*crossDot*
-+                        invenergy[icount];
-+                }
-+            }
-+            else {
-+                measure = crossDot*crossDot*invenergy[icount];
-+            }
-+
-+            /* check if measure is better */
-+            ftmp = crossDot*invenergy[icount];
-+
-+            if ((measure>max_measure) && (fabs(ftmp)<CB_MAXGAIN)) {
-+                best_index = icount;
-+                max_measure = measure;
-+                gain = ftmp;
-+            }
-+        }
-+
-+        /* Search the augmented CB inside the limited range. */
-+        
-+        if ((lTarget==SUBL)&&(sIndAug!=0)) {
-+            searchAugmentedCB(sIndAug, eIndAug, stage, 
-+                2*base_size-20, target, cbvectors+lMem,
-+                &max_measure, &best_index, &gain, energy, 
-+                invenergy);
-+        }
-+
-+        /* record best index */
-+
-+        index[stage] = best_index;
-+
-+        /* gain quantization */
-+
-+        if (stage==0){
-+            
-+            if (gain<0.0){
-+                gain = 0.0;
-+
-+
-+            }
-+            
-+            if (gain>CB_MAXGAIN) {
-+                gain = (float)CB_MAXGAIN;
-+            }
-+            gain = gainquant(gain, 1.0, 32, &gain_index[stage]);
-+        }
-+        else {
-+            if (stage==1) {
-+                gain = gainquant(gain, (float)fabs(gains[stage-1]),
-+                    16, &gain_index[stage]);
-+            } else {
-+                gain = gainquant(gain, (float)fabs(gains[stage-1]),
-+                    8, &gain_index[stage]);
-+            }
-+        }
-+
-+        /* Extract the best (according to measure) 
-+           codebook vector */
-+        
-+        if (lTarget==(STATE_LEN-iLBCenc_inst->state_short_len)) {
-+            
-+            if (index[stage]<base_size) {
-+                pp=buf+LPC_FILTERORDER+lMem-lTarget-index[stage];
-+            } else {
-+                pp=cbvectors+lMem-lTarget-
-+                    index[stage]+base_size;
-+            }
-+        } else {
-+            
-+            if (index[stage]<base_size) {
-+                if (index[stage]<(base_size-20)) {
-+                    pp=buf+LPC_FILTERORDER+lMem-
-+                        lTarget-index[stage];
-+                } else {
-+                    createAugmentedVec(index[stage]-base_size+40,
-+                            buf+LPC_FILTERORDER+lMem,aug_vec);
-+                    pp=aug_vec;
-+                }
-+            } else {
-+                int filterno, position;
-+
-+                filterno=index[stage]/base_size;
-+                position=index[stage]-filterno*base_size;
-+
-+                
-+                if (position<(base_size-20)) {
-+                    pp=cbvectors+filterno*lMem-lTarget-
-+                        index[stage]+filterno*base_size;
-+                } else {
-+                    createAugmentedVec(
-+                        index[stage]-(filterno+1)*base_size+40,
-+                        cbvectors+filterno*lMem,aug_vec);
-+                    pp=aug_vec;
-+
-+
-+                }
-+            }
-+        }
-+
-+        /* Subtract the best codebook vector, according 
-+           to measure, from the target vector */
-+
-+        for (j=0;j<lTarget;j++) {
-+            cvec[j] += gain*(*pp);
-+            target[j] -= gain*(*pp++);
-+        }
-+
-+        /* record quantized gain */
-+
-+        gains[stage]=gain;
-+
-+    }/* end of Main Loop. for (stage=0;... */
-+
-+    /* Gain adjustment for energy matching */
-+    cene=0.0;
-+    for (i=0; i<lTarget; i++) {
-+        cene+=cvec[i]*cvec[i];
-+    }
-+    j=gain_index[0];
-+
-+    for (i=gain_index[0]; i<32; i++) {
-+        ftmp=cene*gain_sq5Tbl[i]*gain_sq5Tbl[i];
-+        
-+        if ((ftmp<(tene*gains[0]*gains[0])) && 
-+            (gain_sq5Tbl[j]<(2.0*gains[0]))) {
-+            j=i;
-+        }
-+    }
-+    gain_index[0]=j;
-+}
-+
-+
-diff -druN codecs/ilbc.orig/iCBSearch.h codecs/ilbc/iCBSearch.h
---- codecs/ilbc.orig/iCBSearch.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iCBSearch.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,35 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iCBSearch.h        
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_ICBSEARCH_H
-+#define __iLBC_ICBSEARCH_H
-+
-+void iCBSearch(
-+    iLBC_Enc_Inst_t *iLBCenc_inst, 
-+                        /* (i) the encoder state structure */
-+    int *index,         /* (o) Codebook indices */
-+    int *gain_index,/* (o) Gain quantization indices */
-+    float *intarget,/* (i) Target vector for encoding */    
-+    float *mem,         /* (i) Buffer for codebook construction */
-+    int lMem,           /* (i) Length of buffer */
-+    int lTarget,    /* (i) Length of vector */
-+    int nStages,    /* (i) Number of codebook stages */
-+    float *weightDenum, /* (i) weighting filter coefficients */
-+
-+
-+    float *weightState, /* (i) weighting filter state */
-+    int block           /* (i) the sub-block number */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/iLBC_decode.c codecs/ilbc/iLBC_decode.c
---- codecs/ilbc.orig/iLBC_decode.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iLBC_decode.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,619 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iLBC_decode.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <stdlib.h>
-+
-+#include "iLBC_define.h"
-+#include "iLBC_decode.h"
-+#include "StateConstructW.h"
-+#include "LPCdecode.h"
-+#include "iCBConstruct.h"
-+#include "doCPLC.h"
-+#include "helpfun.h"
-+#include "constants.h"
-+#include "packing.h"
-+#include "string.h"
-+#include "enhancer.h"
-+#include "hpOutput.h"
-+#include "syntFilter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Initiation of decoder instance.
-+ *---------------------------------------------------------------*/
-+
-+short initDecode(                   /* (o) Number of decoded 
-+                                           samples */
-+    iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-+    int mode,                       /* (i) frame size mode */
-+    int use_enhancer                /* (i) 1 to use enhancer
-+                                           0 to run without 
-+                                             enhancer */
-+){
-+    int i;
-+
-+    iLBCdec_inst->mode = mode;
-+
-+    if (mode==30) {
-+        iLBCdec_inst->blockl = BLOCKL_30MS;
-+        iLBCdec_inst->nsub = NSUB_30MS;
-+        iLBCdec_inst->nasub = NASUB_30MS;
-+        iLBCdec_inst->lpc_n = LPC_N_30MS;
-+
-+
-+        iLBCdec_inst->no_of_bytes = NO_OF_BYTES_30MS;
-+        iLBCdec_inst->no_of_words = NO_OF_WORDS_30MS;
-+        iLBCdec_inst->state_short_len=STATE_SHORT_LEN_30MS;
-+        /* ULP init */
-+        iLBCdec_inst->ULP_inst=&ULP_30msTbl;
-+    }
-+    else if (mode==20) {
-+        iLBCdec_inst->blockl = BLOCKL_20MS;
-+        iLBCdec_inst->nsub = NSUB_20MS;
-+        iLBCdec_inst->nasub = NASUB_20MS;
-+        iLBCdec_inst->lpc_n = LPC_N_20MS;
-+        iLBCdec_inst->no_of_bytes = NO_OF_BYTES_20MS;
-+        iLBCdec_inst->no_of_words = NO_OF_WORDS_20MS;
-+        iLBCdec_inst->state_short_len=STATE_SHORT_LEN_20MS;
-+        /* ULP init */
-+        iLBCdec_inst->ULP_inst=&ULP_20msTbl;
-+    }
-+    else {
-+        exit(2);
-+    }
-+
-+    memset(iLBCdec_inst->syntMem, 0, 
-+        LPC_FILTERORDER*sizeof(float));
-+    memcpy((*iLBCdec_inst).lsfdeqold, lsfmeanTbl, 
-+        LPC_FILTERORDER*sizeof(float));
-+
-+    memset(iLBCdec_inst->old_syntdenum, 0, 
-+        ((LPC_FILTERORDER + 1)*NSUB_MAX)*sizeof(float));
-+    for (i=0; i<NSUB_MAX; i++)
-+        iLBCdec_inst->old_syntdenum[i*(LPC_FILTERORDER+1)]=1.0;
-+
-+    iLBCdec_inst->last_lag = 20;
-+
-+    iLBCdec_inst->prevLag = 120;
-+    iLBCdec_inst->per = 0.0;
-+    iLBCdec_inst->consPLICount = 0;
-+    iLBCdec_inst->prevPLI = 0;
-+    iLBCdec_inst->prevLpc[0] = 1.0;
-+    memset(iLBCdec_inst->prevLpc+1,0,
-+        LPC_FILTERORDER*sizeof(float));
-+    memset(iLBCdec_inst->prevResidual, 0, BLOCKL_MAX*sizeof(float));
-+    iLBCdec_inst->seed=777;
-+
-+    memset(iLBCdec_inst->hpomem, 0, 4*sizeof(float));
-+
-+    iLBCdec_inst->use_enhancer = use_enhancer;
-+    memset(iLBCdec_inst->enh_buf, 0, ENH_BUFL*sizeof(float));
-+    for (i=0;i<ENH_NBLOCKS_TOT;i++) 
-+        iLBCdec_inst->enh_period[i]=(float)40.0;
-+
-+    iLBCdec_inst->prev_enh_pl = 0;
-+
-+    return (iLBCdec_inst->blockl);
-+}
-+
-+
-+
-+/*----------------------------------------------------------------*
-+ *  frame residual decoder function (subrutine to iLBC_decode) 
-+ *---------------------------------------------------------------*/
-+
-+static void Decode(
-+    iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state 
-+                                             structure */
-+    float *decresidual,             /* (o) decoded residual frame */
-+    int start,                      /* (i) location of start 
-+                                           state */
-+    int idxForMax,                  /* (i) codebook index for the 
-+                                           maximum value */
-+    int *idxVec,                /* (i) codebook indexes for the 
-+                                           samples  in the start 
-+                                           state */
-+    float *syntdenum,               /* (i) the decoded synthesis
-+                                           filter coefficients */
-+    int *cb_index,                  /* (i) the indexes for the 
-+                                           adaptive codebook */
-+    int *gain_index,            /* (i) the indexes for the 
-+                                           corresponding gains */
-+    int *extra_cb_index,        /* (i) the indexes for the 
-+                                           adaptive codebook part 
-+                                           of start state */
-+    int *extra_gain_index,          /* (i) the indexes for the 
-+                                           corresponding gains */
-+    int state_first                 /* (i) 1 if non adaptive part 
-+                                           of start state comes 
-+                                           first 0 if that part 
-+                                           comes last */
-+){
-+    float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-+    int k, meml_gotten, Nfor, Nback, i;
-+    int diff, start_pos;
-+    int subcount, subframe;
-+
-+    diff = STATE_LEN - iLBCdec_inst->state_short_len;
-+    
-+    if (state_first == 1) {
-+        start_pos = (start-1)*SUBL;
-+    } else {
-+        start_pos = (start-1)*SUBL + diff;
-+    }
-+
-+    /* decode scalar part of start state */
-+
-+    StateConstructW(idxForMax, idxVec, 
-+        &syntdenum[(start-1)*(LPC_FILTERORDER+1)], 
-+        &decresidual[start_pos], iLBCdec_inst->state_short_len);
-+
-+    
-+    if (state_first) { /* put adaptive part in the end */
-+                
-+
-+
-+        /* setup memory */
-+
-+        memset(mem, 0, 
-+            (CB_MEML-iLBCdec_inst->state_short_len)*sizeof(float));
-+        memcpy(mem+CB_MEML-iLBCdec_inst->state_short_len, 
-+            decresidual+start_pos, 
-+            iLBCdec_inst->state_short_len*sizeof(float));
-+        
-+        /* construct decoded vector */
-+
-+        iCBConstruct(
-+            &decresidual[start_pos+iLBCdec_inst->state_short_len],
-+            extra_cb_index, extra_gain_index, mem+CB_MEML-stMemLTbl,
-+            stMemLTbl, diff, CB_NSTAGES);
-+    
-+    } 
-+    else {/* put adaptive part in the beginning */
-+        
-+        /* create reversed vectors for prediction */
-+
-+        for (k=0; k<diff; k++) {
-+            reverseDecresidual[k] = 
-+                decresidual[(start+1)*SUBL-1-
-+                        (k+iLBCdec_inst->state_short_len)];
-+        }
-+        
-+        /* setup memory */
-+
-+        meml_gotten = iLBCdec_inst->state_short_len;
-+        for (k=0; k<meml_gotten; k++){ 
-+            mem[CB_MEML-1-k] = decresidual[start_pos + k];
-+        } 
-+        memset(mem, 0, (CB_MEML-k)*sizeof(float));
-+        
-+        /* construct decoded vector */
-+
-+        iCBConstruct(reverseDecresidual, extra_cb_index, 
-+            extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl,
-+            diff, CB_NSTAGES);
-+        
-+        /* get decoded residual from reversed vector */
-+
-+        for (k=0; k<diff; k++) {
-+            decresidual[start_pos-1-k] = reverseDecresidual[k];
-+        }
-+    }
-+
-+    /* counter for predicted sub-frames */
-+
-+    subcount=0;
-+
-+    /* forward prediction of sub-frames */
-+
-+    Nfor = iLBCdec_inst->nsub-start-1;
-+
-+
-+    
-+    if ( Nfor > 0 ){
-+        
-+        /* setup memory */
-+
-+        memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-+        memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL,
-+            STATE_LEN*sizeof(float));
-+
-+        /* loop over sub-frames to encode */
-+
-+        for (subframe=0; subframe<Nfor; subframe++) {
-+            
-+            /* construct decoded vector */
-+
-+            iCBConstruct(&decresidual[(start+1+subframe)*SUBL], 
-+                cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                mem+CB_MEML-memLfTbl[subcount], 
-+                memLfTbl[subcount], SUBL, CB_NSTAGES);
-+
-+            /* update memory */
-+
-+            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-+            memcpy(mem+CB_MEML-SUBL, 
-+                &decresidual[(start+1+subframe)*SUBL],
-+                SUBL*sizeof(float));
-+
-+            subcount++;
-+
-+        }
-+
-+    }
-+    
-+    /* backward prediction of sub-frames */
-+
-+    Nback = start-1;
-+
-+    if ( Nback > 0 ) {
-+
-+        /* setup memory */
-+
-+        meml_gotten = SUBL*(iLBCdec_inst->nsub+1-start);
-+        
-+        if ( meml_gotten > CB_MEML ) { 
-+            meml_gotten=CB_MEML;
-+        }
-+        for (k=0; k<meml_gotten; k++) { 
-+            mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-+        }
-+        memset(mem, 0, (CB_MEML-k)*sizeof(float));
-+
-+        /* loop over subframes to decode */
-+
-+
-+
-+        for (subframe=0; subframe<Nback; subframe++) {
-+            
-+            /* construct decoded vector */
-+
-+            iCBConstruct(&reverseDecresidual[subframe*SUBL], 
-+                cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                mem+CB_MEML-memLfTbl[subcount], memLfTbl[subcount], 
-+                SUBL, CB_NSTAGES);
-+
-+            /* update memory */
-+
-+            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-+            memcpy(mem+CB_MEML-SUBL, 
-+                &reverseDecresidual[subframe*SUBL],
-+                SUBL*sizeof(float));
-+
-+            subcount++;
-+        }
-+
-+        /* get decoded residual from reversed vector */
-+
-+        for (i=0; i<SUBL*Nback; i++)
-+            decresidual[SUBL*Nback - i - 1] = 
-+            reverseDecresidual[i];
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  main decoder function 
-+ *---------------------------------------------------------------*/
-+
-+void iLBC_decode( 
-+    float *decblock,            /* (o) decoded signal block */
-+    unsigned char *bytes,           /* (i) encoded signal bits */
-+    iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state 
-+                                             structure */
-+    int mode                    /* (i) 0: bad packet, PLC, 
-+                                           1: normal */
-+){
-+    float data[BLOCKL_MAX];
-+    float lsfdeq[LPC_FILTERORDER*LPC_N_MAX];
-+    float PLCresidual[BLOCKL_MAX], PLClpc[LPC_FILTERORDER + 1];
-+    float zeros[BLOCKL_MAX], one[LPC_FILTERORDER + 1];
-+    int k, i, start, idxForMax, pos, lastpart, ulp;
-+    int lag, ilag;
-+    float cc, maxcc;
-+    int idxVec[STATE_LEN];
-+    int check;
-+    int gain_index[NASUB_MAX*CB_NSTAGES], 
-+        extra_gain_index[CB_NSTAGES];
-+    int cb_index[CB_NSTAGES*NASUB_MAX], extra_cb_index[CB_NSTAGES];
-+    int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-+    int state_first;
-+
-+
-+    int last_bit;
-+    unsigned char *pbytes;
-+    float weightdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-+    int order_plus_one;
-+    float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; 
-+    float decresidual[BLOCKL_MAX];
-+    
-+    if (mode>0) { /* the data are good */
-+
-+        /* decode data */
-+        
-+        pbytes=bytes;
-+        pos=0;
-+
-+        /* Set everything to zero before decoding */
-+
-+        for (k=0; k<LSF_NSPLIT*LPC_N_MAX; k++) {
-+            lsf_i[k]=0;
-+        }
-+        start=0;
-+        state_first=0;
-+        idxForMax=0;
-+        for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-+            idxVec[k]=0;
-+        }
-+        for (k=0; k<CB_NSTAGES; k++) {
-+            extra_cb_index[k]=0;
-+        }
-+        for (k=0; k<CB_NSTAGES; k++) {
-+            extra_gain_index[k]=0;
-+        }
-+        for (i=0; i<iLBCdec_inst->nasub; i++) {
-+            for (k=0; k<CB_NSTAGES; k++) {
-+                cb_index[i*CB_NSTAGES+k]=0;
-+            }
-+        }
-+        for (i=0; i<iLBCdec_inst->nasub; i++) {
-+            for (k=0; k<CB_NSTAGES; k++) {
-+                gain_index[i*CB_NSTAGES+k]=0;
-+            }
-+        }
-+
-+        /* loop over ULP classes */
-+
-+        for (ulp=0; ulp<3; ulp++) {
-+        
-+            /* LSF */
-+            for (k=0; k<LSF_NSPLIT*iLBCdec_inst->lpc_n; k++){
-+                unpack( &pbytes, &lastpart, 
-+                    iLBCdec_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-+                packcombine(&lsf_i[k], lastpart,
-+                    iLBCdec_inst->ULP_inst->lsf_bits[k][ulp]);
-+            }
-+
-+
-+
-+            /* Start block info */
-+
-+            unpack( &pbytes, &lastpart, 
-+                iLBCdec_inst->ULP_inst->start_bits[ulp], &pos);
-+            packcombine(&start, lastpart, 
-+                iLBCdec_inst->ULP_inst->start_bits[ulp]);
-+
-+            unpack( &pbytes, &lastpart, 
-+                iLBCdec_inst->ULP_inst->startfirst_bits[ulp], &pos);
-+            packcombine(&state_first, lastpart,
-+                iLBCdec_inst->ULP_inst->startfirst_bits[ulp]);
-+
-+            unpack( &pbytes, &lastpart, 
-+                iLBCdec_inst->ULP_inst->scale_bits[ulp], &pos);
-+            packcombine(&idxForMax, lastpart, 
-+                iLBCdec_inst->ULP_inst->scale_bits[ulp]);
-+
-+            for (k=0; k<iLBCdec_inst->state_short_len; k++) {
-+                unpack( &pbytes, &lastpart, 
-+                    iLBCdec_inst->ULP_inst->state_bits[ulp], &pos);
-+                packcombine(idxVec+k, lastpart,
-+                    iLBCdec_inst->ULP_inst->state_bits[ulp]);
-+            }
-+
-+            /* 23/22 (20ms/30ms) sample block */
-+
-+            for (k=0; k<CB_NSTAGES; k++) {
-+                unpack( &pbytes, &lastpart, 
-+                    iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp], 
-+                    &pos);
-+                packcombine(extra_cb_index+k, lastpart, 
-+                    iLBCdec_inst->ULP_inst->extra_cb_index[k][ulp]);
-+            }
-+            for (k=0; k<CB_NSTAGES; k++) {
-+                unpack( &pbytes, &lastpart, 
-+                    iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp], 
-+                    &pos);
-+                packcombine(extra_gain_index+k, lastpart,
-+                    iLBCdec_inst->ULP_inst->extra_cb_gain[k][ulp]);
-+            }
-+                
-+            /* The two/four (20ms/30ms) 40 sample sub-blocks */
-+
-+            for (i=0; i<iLBCdec_inst->nasub; i++) {
-+                for (k=0; k<CB_NSTAGES; k++) {
-+                    unpack( &pbytes, &lastpart, 
-+                    iLBCdec_inst->ULP_inst->cb_index[i][k][ulp], 
-+                        &pos);
-+                    packcombine(cb_index+i*CB_NSTAGES+k, lastpart, 
-+                    iLBCdec_inst->ULP_inst->cb_index[i][k][ulp]);
-+                }
-+            }
-+            
-+            for (i=0; i<iLBCdec_inst->nasub; i++) {
-+
-+
-+                for (k=0; k<CB_NSTAGES; k++) {
-+                    unpack( &pbytes, &lastpart, 
-+
-+                    iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp], 
-+                        &pos);
-+                    packcombine(gain_index+i*CB_NSTAGES+k, lastpart,
-+                        iLBCdec_inst->ULP_inst->cb_gain[i][k][ulp]);
-+                }
-+            }
-+        }
-+        /* Extract last bit. If it is 1 this indicates an 
-+           empty/lost frame */
-+        unpack( &pbytes, &last_bit, 1, &pos);
-+
-+        /* Check for bit errors or empty/lost frames */
-+        if (start<1)
-+            mode = 0;
-+        if (iLBCdec_inst->mode==20 && start>3)
-+            mode = 0;
-+        if (iLBCdec_inst->mode==30 && start>5)
-+            mode = 0;
-+        if (last_bit==1)
-+            mode = 0;
-+
-+        if (mode==1) { /* No bit errors was detected, 
-+                          continue decoding */
-+                
-+            /* adjust index */
-+            index_conv_dec(cb_index);
-+
-+            /* decode the lsf */
-+
-+            SimplelsfDEQ(lsfdeq, lsf_i, iLBCdec_inst->lpc_n);
-+            check=LSF_check(lsfdeq, LPC_FILTERORDER, 
-+                iLBCdec_inst->lpc_n);
-+            DecoderInterpolateLSF(syntdenum, weightdenum, 
-+                lsfdeq, LPC_FILTERORDER, iLBCdec_inst);
-+        
-+            Decode(iLBCdec_inst, decresidual, start, idxForMax, 
-+                idxVec, syntdenum, cb_index, gain_index, 
-+                extra_cb_index, extra_gain_index, 
-+                state_first);
-+
-+            /* preparing the plc for a future loss! */
-+
-+            doThePLC(PLCresidual, PLClpc, 0, decresidual, 
-+                syntdenum + 
-+                (LPC_FILTERORDER + 1)*(iLBCdec_inst->nsub - 1),
-+                (*iLBCdec_inst).last_lag, iLBCdec_inst);
-+
-+        
-+            memcpy(decresidual, PLCresidual, 
-+                iLBCdec_inst->blockl*sizeof(float));
-+        }
-+
-+
-+        
-+    }
-+    
-+    if (mode == 0) {
-+        /* the data is bad (either a PLC call
-+         * was made or a severe bit error was detected)
-+         */
-+        
-+        /* packet loss conceal */
-+
-+        memset(zeros, 0, BLOCKL_MAX*sizeof(float));
-+        
-+        one[0] = 1;
-+        memset(one+1, 0, LPC_FILTERORDER*sizeof(float));
-+        
-+        start=0;
-+        
-+        doThePLC(PLCresidual, PLClpc, 1, zeros, one,
-+            (*iLBCdec_inst).last_lag, iLBCdec_inst);
-+        memcpy(decresidual, PLCresidual, 
-+            iLBCdec_inst->blockl*sizeof(float));
-+        
-+        order_plus_one = LPC_FILTERORDER + 1;
-+        for (i = 0; i < iLBCdec_inst->nsub; i++) {
-+            memcpy(syntdenum+(i*order_plus_one), PLClpc, 
-+                order_plus_one*sizeof(float));
-+        }
-+    }
-+
-+    if (iLBCdec_inst->use_enhancer == 1) {
-+
-+        /* post filtering */
-+        
-+        iLBCdec_inst->last_lag = 
-+            enhancerInterface(data, decresidual, iLBCdec_inst);
-+
-+        /* synthesis filtering */
-+        
-+        if (iLBCdec_inst->mode==20) {
-+            /* Enhancer has 40 samples delay */
-+            i=0;
-+            syntFilter(data + i*SUBL, 
-+                iLBCdec_inst->old_syntdenum + 
-+                (i+iLBCdec_inst->nsub-1)*(LPC_FILTERORDER+1), 
-+                SUBL, iLBCdec_inst->syntMem);
-+            for (i=1; i < iLBCdec_inst->nsub; i++) {
-+                syntFilter(data + i*SUBL, 
-+                    syntdenum + (i-1)*(LPC_FILTERORDER+1), 
-+                    SUBL, iLBCdec_inst->syntMem);
-+            }
-+        } else if (iLBCdec_inst->mode==30) {
-+            /* Enhancer has 80 samples delay */
-+            for (i=0; i < 2; i++) {
-+                syntFilter(data + i*SUBL, 
-+
-+
-+                    iLBCdec_inst->old_syntdenum + 
-+                    (i+iLBCdec_inst->nsub-2)*(LPC_FILTERORDER+1),
-+                    SUBL, iLBCdec_inst->syntMem);
-+            }
-+            for (i=2; i < iLBCdec_inst->nsub; i++) {
-+                syntFilter(data + i*SUBL, 
-+                    syntdenum + (i-2)*(LPC_FILTERORDER+1), SUBL,
-+                    iLBCdec_inst->syntMem);
-+            }
-+        }
-+
-+    } else {
-+
-+        /* Find last lag */
-+        lag = 20;
-+        maxcc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], 
-+            &decresidual[BLOCKL_MAX-ENH_BLOCKL-lag], ENH_BLOCKL);
-+        
-+        for (ilag=21; ilag<120; ilag++) {
-+            cc = xCorrCoef(&decresidual[BLOCKL_MAX-ENH_BLOCKL], 
-+                &decresidual[BLOCKL_MAX-ENH_BLOCKL-ilag], 
-+                ENH_BLOCKL);
-+        
-+            if (cc > maxcc) {
-+                maxcc = cc;
-+                lag = ilag;
-+            }
-+        }
-+        iLBCdec_inst->last_lag = lag;
-+
-+        /* copy data and run synthesis filter */
-+
-+        memcpy(data, decresidual, 
-+            iLBCdec_inst->blockl*sizeof(float));
-+        for (i=0; i < iLBCdec_inst->nsub; i++) {
-+            syntFilter(data + i*SUBL, 
-+                syntdenum + i*(LPC_FILTERORDER+1), SUBL, 
-+                iLBCdec_inst->syntMem);
-+        }
-+    }
-+
-+    /* high pass filtering on output if desired, otherwise 
-+       copy to out */
-+
-+    hpOutput(data, iLBCdec_inst->blockl, 
-+                decblock,iLBCdec_inst->hpomem);
-+
-+    /* memcpy(decblock,data,iLBCdec_inst->blockl*sizeof(float));*/
-+
-+    memcpy(iLBCdec_inst->old_syntdenum, syntdenum, 
-+
-+        iLBCdec_inst->nsub*(LPC_FILTERORDER+1)*sizeof(float));
-+
-+    iLBCdec_inst->prev_enh_pl=0;
-+
-+
-+
-+    if (mode==0) { /* PLC was used */
-+        iLBCdec_inst->prev_enh_pl=1;
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/iLBC_decode.h codecs/ilbc/iLBC_decode.h
---- codecs/ilbc.orig/iLBC_decode.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iLBC_decode.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,40 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iLBC_decode.h    
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_ILBCDECODE_H
-+#define __iLBC_ILBCDECODE_H
-+
-+#include "iLBC_define.h"
-+
-+short initDecode(                   /* (o) Number of decoded 
-+                                           samples */
-+    iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) Decoder instance */
-+    int mode,                       /* (i) frame size mode */
-+    int use_enhancer                /* (i) 1 to use enhancer
-+                                           0 to run without 
-+                                             enhancer */
-+);
-+
-+void iLBC_decode( 
-+    float *decblock,            /* (o) decoded signal block */
-+    unsigned char *bytes,           /* (i) encoded signal bits */
-+    iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state 
-+                                             structure */
-+    int mode                    /* (i) 0: bad packet, PLC, 
-+                                           1: normal */
-+);
-+
-+
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/iLBC_define.h codecs/ilbc/iLBC_define.h
---- codecs/ilbc.orig/iLBC_define.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iLBC_define.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,201 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iLBC_define.h    
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+#include <string.h>
-+
-+#ifndef __iLBC_ILBCDEFINE_H
-+#define __iLBC_ILBCDEFINE_H
-+
-+/* general codec settings */
-+
-+#define FS                      (float)8000.0
-+#define BLOCKL_20MS             160
-+#define BLOCKL_30MS             240
-+#define BLOCKL_MAX              240
-+#define NSUB_20MS               4
-+#define NSUB_30MS               6
-+#define NSUB_MAX            6
-+#define NASUB_20MS              2
-+#define NASUB_30MS              4
-+#define NASUB_MAX               4
-+#define SUBL                40
-+#define STATE_LEN               80
-+#define STATE_SHORT_LEN_30MS    58
-+#define STATE_SHORT_LEN_20MS    57
-+
-+/* LPC settings */
-+
-+#define LPC_FILTERORDER         10
-+#define LPC_CHIRP_SYNTDENUM     (float)0.9025
-+#define LPC_CHIRP_WEIGHTDENUM   (float)0.4222
-+#define LPC_LOOKBACK        60
-+#define LPC_N_20MS              1
-+#define LPC_N_30MS              2
-+#define LPC_N_MAX               2
-+#define LPC_ASYMDIFF        20
-+#define LPC_BW                  (float)60.0
-+#define LPC_WN                  (float)1.0001
-+#define LSF_NSPLIT              3
-+
-+#define LSF_NUMBER_OF_STEPS     4
-+#define LPC_HALFORDER           (LPC_FILTERORDER/2)
-+
-+/* cb settings */
-+
-+#define CB_NSTAGES              3
-+#define CB_EXPAND               2
-+#define CB_MEML                 147
-+#define CB_FILTERLEN        2*4
-+#define CB_HALFFILTERLEN    4
-+#define CB_RESRANGE             34
-+#define CB_MAXGAIN              (float)1.3 
-+
-+/* enhancer */
-+
-+#define ENH_BLOCKL              80  /* block length */
-+#define ENH_BLOCKL_HALF         (ENH_BLOCKL/2)
-+#define ENH_HL                  3   /* 2*ENH_HL+1 is number blocks
-+                                       in said second sequence */
-+#define ENH_SLOP            2   /* max difference estimated and
-+                                       correct pitch period */
-+#define ENH_PLOCSL              20  /* pitch-estimates and pitch-
-+                                       locations buffer length */
-+#define ENH_OVERHANG        2
-+#define ENH_UPS0            4   /* upsampling rate */
-+#define ENH_FL0                 3   /* 2*FLO+1 is the length of 
-+                                       each filter */
-+#define ENH_VECTL               (ENH_BLOCKL+2*ENH_FL0)
-+#define ENH_CORRDIM             (2*ENH_SLOP+1)
-+#define ENH_NBLOCKS             (BLOCKL_MAX/ENH_BLOCKL)
-+#define ENH_NBLOCKS_EXTRA       5
-+#define ENH_NBLOCKS_TOT         8   /* ENH_NBLOCKS + 
-+                                       ENH_NBLOCKS_EXTRA */
-+#define ENH_BUFL            (ENH_NBLOCKS_TOT)*ENH_BLOCKL
-+#define ENH_ALPHA0              (float)0.05
-+
-+/* Down sampling */
-+
-+#define FILTERORDER_DS          7
-+#define DELAY_DS            3
-+#define FACTOR_DS               2
-+
-+/* bit stream defs */
-+
-+#define NO_OF_BYTES_20MS    38
-+#define NO_OF_BYTES_30MS    50
-+#define NO_OF_WORDS_20MS    19
-+#define NO_OF_WORDS_30MS    25
-+#define STATE_BITS              3
-+#define BYTE_LEN            8
-+#define ULP_CLASSES             3
-+
-+/* help parameters */
-+
-+
-+#define FLOAT_MAX               (float)1.0e37
-+#define EPS                     (float)2.220446049250313e-016
-+#define PI                      (float)3.14159265358979323846
-+#define MIN_SAMPLE              -32768
-+#define MAX_SAMPLE              32767
-+#define TWO_PI                  (float)6.283185307
-+#define PI2                     (float)0.159154943
-+
-+/* type definition encoder instance */
-+typedef struct iLBC_ULP_Inst_t_ {
-+    int lsf_bits[6][ULP_CLASSES+2];
-+    int start_bits[ULP_CLASSES+2];
-+    int startfirst_bits[ULP_CLASSES+2];
-+    int scale_bits[ULP_CLASSES+2];
-+    int state_bits[ULP_CLASSES+2];
-+    int extra_cb_index[CB_NSTAGES][ULP_CLASSES+2];
-+    int extra_cb_gain[CB_NSTAGES][ULP_CLASSES+2];
-+    int cb_index[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-+    int cb_gain[NSUB_MAX][CB_NSTAGES][ULP_CLASSES+2];
-+} iLBC_ULP_Inst_t;
-+
-+/* type definition encoder instance */
-+typedef struct iLBC_Enc_Inst_t_ {
-+
-+    /* flag for frame size mode */
-+    int mode;
-+
-+    /* basic parameters for different frame sizes */
-+    int blockl;
-+    int nsub;
-+    int nasub;
-+    int no_of_bytes, no_of_words;
-+    int lpc_n;
-+    int state_short_len;
-+    const iLBC_ULP_Inst_t *ULP_inst;
-+
-+    /* analysis filter state */
-+    float anaMem[LPC_FILTERORDER];
-+
-+    /* old lsf parameters for interpolation */
-+    float lsfold[LPC_FILTERORDER];
-+    float lsfdeqold[LPC_FILTERORDER];
-+
-+    /* signal buffer for LP analysis */
-+    float lpc_buffer[LPC_LOOKBACK + BLOCKL_MAX];
-+
-+    /* state of input HP filter */
-+    float hpimem[4];
-+
-+} iLBC_Enc_Inst_t;
-+
-+/* type definition decoder instance */
-+typedef struct iLBC_Dec_Inst_t_ {
-+
-+
-+    /* flag for frame size mode */
-+    int mode;
-+
-+    /* basic parameters for different frame sizes */
-+    int blockl;
-+    int nsub;
-+    int nasub;
-+    int no_of_bytes, no_of_words;
-+    int lpc_n;
-+    int state_short_len;
-+    const iLBC_ULP_Inst_t *ULP_inst;
-+
-+    /* synthesis filter state */
-+    float syntMem[LPC_FILTERORDER];
-+
-+    /* old LSF for interpolation */
-+    float lsfdeqold[LPC_FILTERORDER];
-+
-+    /* pitch lag estimated in enhancer and used in PLC */
-+    int last_lag;
-+
-+    /* PLC state information */
-+    int prevLag, consPLICount, prevPLI, prev_enh_pl;
-+    float prevLpc[LPC_FILTERORDER+1];
-+    float prevResidual[NSUB_MAX*SUBL];
-+    float per;
-+    unsigned long seed;
-+
-+    /* previous synthesis filter parameters */
-+    float old_syntdenum[(LPC_FILTERORDER + 1)*NSUB_MAX];
-+
-+    /* state of output HP filter */
-+    float hpomem[4];
-+
-+    /* enhancer state information */
-+    int use_enhancer;
-+    float enh_buf[ENH_BUFL];
-+    float enh_period[ENH_NBLOCKS_TOT];
-+
-+} iLBC_Dec_Inst_t;
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/iLBC_encode.c codecs/ilbc/iLBC_encode.c
---- codecs/ilbc.orig/iLBC_encode.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iLBC_encode.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,514 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iLBC_encode.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "iLBC_define.h"
-+#include "iLBC_encode.h"
-+#include "LPCencode.h"
-+#include "FrameClassify.h"
-+#include "StateSearchW.h"
-+#include "StateConstructW.h"
-+#include "helpfun.h"
-+#include "constants.h"
-+#include "packing.h"
-+#include "iCBSearch.h"
-+#include "iCBConstruct.h"
-+#include "hpInput.h"
-+#include "anaFilter.h"
-+#include "syntFilter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  Initiation of encoder instance.
-+ *---------------------------------------------------------------*/
-+
-+short initEncode(                   /* (o) Number of bytes 
-+                                           encoded */
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-+    int mode                    /* (i) frame size mode */
-+){
-+    iLBCenc_inst->mode = mode;
-+    if (mode==30) {
-+        iLBCenc_inst->blockl = BLOCKL_30MS;
-+        iLBCenc_inst->nsub = NSUB_30MS;
-+
-+
-+        iLBCenc_inst->nasub = NASUB_30MS;
-+        iLBCenc_inst->lpc_n = LPC_N_30MS;
-+        iLBCenc_inst->no_of_bytes = NO_OF_BYTES_30MS;
-+        iLBCenc_inst->no_of_words = NO_OF_WORDS_30MS;
-+        iLBCenc_inst->state_short_len=STATE_SHORT_LEN_30MS;
-+        /* ULP init */
-+        iLBCenc_inst->ULP_inst=&ULP_30msTbl;
-+    }
-+    else if (mode==20) {
-+        iLBCenc_inst->blockl = BLOCKL_20MS;
-+        iLBCenc_inst->nsub = NSUB_20MS;
-+        iLBCenc_inst->nasub = NASUB_20MS;
-+        iLBCenc_inst->lpc_n = LPC_N_20MS;
-+        iLBCenc_inst->no_of_bytes = NO_OF_BYTES_20MS;
-+        iLBCenc_inst->no_of_words = NO_OF_WORDS_20MS;
-+        iLBCenc_inst->state_short_len=STATE_SHORT_LEN_20MS;
-+        /* ULP init */
-+        iLBCenc_inst->ULP_inst=&ULP_20msTbl;
-+    }
-+    else {
-+        exit(2);
-+    }
-+
-+    memset((*iLBCenc_inst).anaMem, 0, 
-+        LPC_FILTERORDER*sizeof(float));
-+    memcpy((*iLBCenc_inst).lsfold, lsfmeanTbl,
-+        LPC_FILTERORDER*sizeof(float));
-+    memcpy((*iLBCenc_inst).lsfdeqold, lsfmeanTbl,
-+        LPC_FILTERORDER*sizeof(float));
-+    memset((*iLBCenc_inst).lpc_buffer, 0, 
-+        (LPC_LOOKBACK+BLOCKL_MAX)*sizeof(float));
-+    memset((*iLBCenc_inst).hpimem, 0, 4*sizeof(float));
-+
-+    return (iLBCenc_inst->no_of_bytes);
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  main encoder function 
-+ *---------------------------------------------------------------*/
-+
-+void iLBC_encode(
-+    unsigned char *bytes,           /* (o) encoded data bits iLBC */
-+    float *block,                   /* (o) speech vector to 
-+                                           encode */
-+    iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder 
-+                                           state */
-+){
-+    
-+    float data[BLOCKL_MAX];
-+    float residual[BLOCKL_MAX], reverseResidual[BLOCKL_MAX];
-+
-+    int start, idxForMax, idxVec[STATE_LEN];
-+    float reverseDecresidual[BLOCKL_MAX], mem[CB_MEML];
-+    int n, k, meml_gotten, Nfor, Nback, i, pos;
-+
-+
-+    int gain_index[CB_NSTAGES*NASUB_MAX], 
-+        extra_gain_index[CB_NSTAGES];
-+    int cb_index[CB_NSTAGES*NASUB_MAX],extra_cb_index[CB_NSTAGES];
-+    int lsf_i[LSF_NSPLIT*LPC_N_MAX];
-+    unsigned char *pbytes;
-+    int diff, start_pos, state_first;
-+    float en1, en2;
-+    int index, ulp, firstpart;
-+    int subcount, subframe;
-+    float weightState[LPC_FILTERORDER];
-+    float syntdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; 
-+    float weightdenum[NSUB_MAX*(LPC_FILTERORDER+1)]; 
-+    float decresidual[BLOCKL_MAX];
-+
-+    /* high pass filtering of input signal if such is not done 
-+           prior to calling this function */
-+
-+    hpInput(block, iLBCenc_inst->blockl, 
-+                data, (*iLBCenc_inst).hpimem);
-+
-+    /* otherwise simply copy */
-+
-+    /*memcpy(data,block,iLBCenc_inst->blockl*sizeof(float));*/
-+        
-+    /* LPC of hp filtered input data */
-+
-+    LPCencode(syntdenum, weightdenum, lsf_i, data, iLBCenc_inst);
-+
-+
-+    /* inverse filter to get residual */
-+
-+    for (n=0; n<iLBCenc_inst->nsub; n++) {
-+        anaFilter(&data[n*SUBL], &syntdenum[n*(LPC_FILTERORDER+1)], 
-+            SUBL, &residual[n*SUBL], iLBCenc_inst->anaMem);
-+    }
-+
-+    /* find state location */
-+
-+    start = FrameClassify(iLBCenc_inst, residual);
-+    
-+    /* check if state should be in first or last part of the 
-+    two subframes */
-+
-+    diff = STATE_LEN - iLBCenc_inst->state_short_len;
-+    en1 = 0;
-+    index = (start-1)*SUBL;
-+    for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-+        en1 += residual[index+i]*residual[index+i];
-+    }
-+    en2 = 0;
-+    index = (start-1)*SUBL+diff;
-+    for (i = 0; i < iLBCenc_inst->state_short_len; i++) {
-+        en2 += residual[index+i]*residual[index+i];
-+    }
-+
-+
-+    
-+    
-+    if (en1 > en2) {
-+        state_first = 1;
-+        start_pos = (start-1)*SUBL;
-+    } else {
-+        state_first = 0;
-+        start_pos = (start-1)*SUBL + diff;
-+    }
-+
-+    /* scalar quantization of state */
-+
-+    StateSearchW(iLBCenc_inst, &residual[start_pos], 
-+        &syntdenum[(start-1)*(LPC_FILTERORDER+1)], 
-+        &weightdenum[(start-1)*(LPC_FILTERORDER+1)], &idxForMax, 
-+        idxVec, iLBCenc_inst->state_short_len, state_first);
-+
-+    StateConstructW(idxForMax, idxVec, 
-+        &syntdenum[(start-1)*(LPC_FILTERORDER+1)], 
-+        &decresidual[start_pos], iLBCenc_inst->state_short_len);
-+
-+    /* predictive quantization in state */
-+    
-+    if (state_first) { /* put adaptive part in the end */
-+        
-+        /* setup memory */
-+
-+        memset(mem, 0, 
-+            (CB_MEML-iLBCenc_inst->state_short_len)*sizeof(float));
-+        memcpy(mem+CB_MEML-iLBCenc_inst->state_short_len, 
-+            decresidual+start_pos, 
-+            iLBCenc_inst->state_short_len*sizeof(float));
-+        memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+
-+        /* encode sub-frames */
-+
-+        iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, 
-+            &residual[start_pos+iLBCenc_inst->state_short_len], 
-+            mem+CB_MEML-stMemLTbl,
-+            stMemLTbl, diff, CB_NSTAGES, 
-+            &weightdenum[start*(LPC_FILTERORDER+1)], 
-+            weightState, 0);
-+
-+        /* construct decoded vector */
-+
-+        iCBConstruct(
-+            &decresidual[start_pos+iLBCenc_inst->state_short_len],
-+            extra_cb_index, extra_gain_index, 
-+            mem+CB_MEML-stMemLTbl, 
-+            stMemLTbl, diff, CB_NSTAGES);
-+    
-+    } 
-+    else { /* put adaptive part in the beginning */
-+        
-+
-+
-+        /* create reversed vectors for prediction */
-+
-+        for (k=0; k<diff; k++) {
-+            reverseResidual[k] = residual[(start+1)*SUBL-1
-+                -(k+iLBCenc_inst->state_short_len)];
-+        }
-+        
-+        /* setup memory */
-+
-+        meml_gotten = iLBCenc_inst->state_short_len;
-+        for (k=0; k<meml_gotten; k++) { 
-+            mem[CB_MEML-1-k] = decresidual[start_pos + k];
-+        } 
-+        memset(mem, 0, (CB_MEML-k)*sizeof(float));
-+        memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+        
-+        /* encode sub-frames */
-+
-+        iCBSearch(iLBCenc_inst, extra_cb_index, extra_gain_index, 
-+            reverseResidual, mem+CB_MEML-stMemLTbl, stMemLTbl, 
-+            diff, CB_NSTAGES, 
-+            &weightdenum[(start-1)*(LPC_FILTERORDER+1)], 
-+            weightState, 0);
-+
-+        /* construct decoded vector */
-+
-+        iCBConstruct(reverseDecresidual, extra_cb_index, 
-+            extra_gain_index, mem+CB_MEML-stMemLTbl, stMemLTbl, 
-+            diff, CB_NSTAGES);
-+        
-+        /* get decoded residual from reversed vector */
-+
-+        for (k=0; k<diff; k++) {
-+            decresidual[start_pos-1-k] = reverseDecresidual[k];
-+        }
-+    }
-+
-+    /* counter for predicted sub-frames */
-+
-+    subcount=0;
-+
-+    /* forward prediction of sub-frames */
-+
-+    Nfor = iLBCenc_inst->nsub-start-1;
-+
-+    
-+    if ( Nfor > 0 ) {
-+        
-+        /* setup memory */
-+
-+        memset(mem, 0, (CB_MEML-STATE_LEN)*sizeof(float));
-+        memcpy(mem+CB_MEML-STATE_LEN, decresidual+(start-1)*SUBL, 
-+            STATE_LEN*sizeof(float));
-+        memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+
-+
-+
-+        /* loop over sub-frames to encode */
-+
-+        for (subframe=0; subframe<Nfor; subframe++) {
-+
-+            /* encode sub-frame */
-+
-+            iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                &residual[(start+1+subframe)*SUBL], 
-+                mem+CB_MEML-memLfTbl[subcount], 
-+                memLfTbl[subcount], SUBL, CB_NSTAGES, 
-+                &weightdenum[(start+1+subframe)*
-+                            (LPC_FILTERORDER+1)],
-+                weightState, subcount+1);
-+
-+            /* construct decoded vector */
-+
-+            iCBConstruct(&decresidual[(start+1+subframe)*SUBL], 
-+                cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                mem+CB_MEML-memLfTbl[subcount], 
-+                memLfTbl[subcount], SUBL, CB_NSTAGES);
-+
-+            /* update memory */
-+
-+            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-+            memcpy(mem+CB_MEML-SUBL, 
-+                &decresidual[(start+1+subframe)*SUBL], 
-+                SUBL*sizeof(float));
-+            memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+
-+            subcount++;
-+        }
-+    }
-+    
-+
-+    /* backward prediction of sub-frames */
-+
-+    Nback = start-1;
-+
-+    
-+    if ( Nback > 0 ) {
-+               
-+        /* create reverse order vectors */
-+
-+        for (n=0; n<Nback; n++) {
-+            for (k=0; k<SUBL; k++) {
-+                reverseResidual[n*SUBL+k] = 
-+                    residual[(start-1)*SUBL-1-n*SUBL-k];
-+                reverseDecresidual[n*SUBL+k] = 
-+                    decresidual[(start-1)*SUBL-1-n*SUBL-k];
-+            }
-+        }
-+
-+
-+
-+        /* setup memory */
-+
-+        meml_gotten = SUBL*(iLBCenc_inst->nsub+1-start);
-+
-+        
-+        if ( meml_gotten > CB_MEML ) { 
-+            meml_gotten=CB_MEML;
-+        }
-+        for (k=0; k<meml_gotten; k++) { 
-+            mem[CB_MEML-1-k] = decresidual[(start-1)*SUBL + k];
-+        } 
-+        memset(mem, 0, (CB_MEML-k)*sizeof(float));
-+        memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+
-+        /* loop over sub-frames to encode */
-+
-+        for (subframe=0; subframe<Nback; subframe++) {
-+            
-+            /* encode sub-frame */
-+
-+            iCBSearch(iLBCenc_inst, cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                &reverseResidual[subframe*SUBL], 
-+                mem+CB_MEML-memLfTbl[subcount], 
-+                memLfTbl[subcount], SUBL, CB_NSTAGES, 
-+                &weightdenum[(start-2-subframe)*
-+                            (LPC_FILTERORDER+1)], 
-+                weightState, subcount+1);
-+
-+            /* construct decoded vector */
-+
-+            iCBConstruct(&reverseDecresidual[subframe*SUBL], 
-+                cb_index+subcount*CB_NSTAGES, 
-+                gain_index+subcount*CB_NSTAGES, 
-+                mem+CB_MEML-memLfTbl[subcount], 
-+                memLfTbl[subcount], SUBL, CB_NSTAGES);
-+
-+            /* update memory */
-+
-+            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
-+            memcpy(mem+CB_MEML-SUBL, 
-+                &reverseDecresidual[subframe*SUBL],
-+                SUBL*sizeof(float));
-+            memset(weightState, 0, LPC_FILTERORDER*sizeof(float));
-+
-+            subcount++;
-+
-+        }
-+
-+        /* get decoded residual from reversed vector */
-+
-+        for (i=0; i<SUBL*Nback; i++) {
-+            decresidual[SUBL*Nback - i - 1] = 
-+
-+
-+                reverseDecresidual[i];
-+        }
-+    }
-+    /* end encoding part */
-+
-+    /* adjust index */
-+    index_conv_enc(cb_index);
-+
-+    /* pack bytes */
-+
-+    pbytes=bytes;
-+    pos=0;
-+
-+    /* loop over the 3 ULP classes */
-+
-+    for (ulp=0; ulp<3; ulp++) {
-+    
-+        /* LSF */
-+        for (k=0; k<LSF_NSPLIT*iLBCenc_inst->lpc_n; k++) {
-+            packsplit(&lsf_i[k], &firstpart, &lsf_i[k], 
-+                iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], 
-+                iLBCenc_inst->ULP_inst->lsf_bits[k][ulp]+
-+                iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+1]+
-+                iLBCenc_inst->ULP_inst->lsf_bits[k][ulp+2]);
-+            dopack( &pbytes, firstpart, 
-+                iLBCenc_inst->ULP_inst->lsf_bits[k][ulp], &pos);
-+        }
-+
-+        /* Start block info */
-+
-+        packsplit(&start, &firstpart, &start, 
-+            iLBCenc_inst->ULP_inst->start_bits[ulp], 
-+            iLBCenc_inst->ULP_inst->start_bits[ulp]+
-+            iLBCenc_inst->ULP_inst->start_bits[ulp+1]+
-+            iLBCenc_inst->ULP_inst->start_bits[ulp+2]);
-+        dopack( &pbytes, firstpart, 
-+            iLBCenc_inst->ULP_inst->start_bits[ulp], &pos);
-+
-+        packsplit(&state_first, &firstpart, &state_first, 
-+            iLBCenc_inst->ULP_inst->startfirst_bits[ulp], 
-+            iLBCenc_inst->ULP_inst->startfirst_bits[ulp]+
-+            iLBCenc_inst->ULP_inst->startfirst_bits[ulp+1]+
-+            iLBCenc_inst->ULP_inst->startfirst_bits[ulp+2]);
-+        dopack( &pbytes, firstpart, 
-+            iLBCenc_inst->ULP_inst->startfirst_bits[ulp], &pos);
-+
-+        packsplit(&idxForMax, &firstpart, &idxForMax, 
-+            iLBCenc_inst->ULP_inst->scale_bits[ulp], 
-+            iLBCenc_inst->ULP_inst->scale_bits[ulp]+
-+            iLBCenc_inst->ULP_inst->scale_bits[ulp+1]+
-+            iLBCenc_inst->ULP_inst->scale_bits[ulp+2]);
-+        dopack( &pbytes, firstpart, 
-+            iLBCenc_inst->ULP_inst->scale_bits[ulp], &pos);
-+
-+
-+
-+        for (k=0; k<iLBCenc_inst->state_short_len; k++) {
-+            packsplit(idxVec+k, &firstpart, idxVec+k, 
-+                iLBCenc_inst->ULP_inst->state_bits[ulp], 
-+                iLBCenc_inst->ULP_inst->state_bits[ulp]+
-+                iLBCenc_inst->ULP_inst->state_bits[ulp+1]+
-+                iLBCenc_inst->ULP_inst->state_bits[ulp+2]);
-+            dopack( &pbytes, firstpart, 
-+                iLBCenc_inst->ULP_inst->state_bits[ulp], &pos);
-+        }
-+
-+        /* 23/22 (20ms/30ms) sample block */
-+
-+        for (k=0;k<CB_NSTAGES;k++) {
-+            packsplit(extra_cb_index+k, &firstpart, 
-+                extra_cb_index+k, 
-+                iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], 
-+                iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp]+
-+                iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+1]+
-+                iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp+2]);
-+            dopack( &pbytes, firstpart, 
-+                iLBCenc_inst->ULP_inst->extra_cb_index[k][ulp], 
-+                &pos);
-+        }
-+
-+        for (k=0;k<CB_NSTAGES;k++) {
-+            packsplit(extra_gain_index+k, &firstpart, 
-+                extra_gain_index+k, 
-+                iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], 
-+                iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp]+
-+                iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+1]+
-+                iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp+2]);
-+            dopack( &pbytes, firstpart, 
-+                iLBCenc_inst->ULP_inst->extra_cb_gain[k][ulp], 
-+                &pos);
-+        }
-+            
-+        /* The two/four (20ms/30ms) 40 sample sub-blocks */
-+
-+        for (i=0; i<iLBCenc_inst->nasub; i++) {
-+            for (k=0; k<CB_NSTAGES; k++) {
-+                packsplit(cb_index+i*CB_NSTAGES+k, &firstpart, 
-+                    cb_index+i*CB_NSTAGES+k, 
-+                    iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], 
-+                    iLBCenc_inst->ULP_inst->cb_index[i][k][ulp]+
-+                    iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+1]+
-+                    iLBCenc_inst->ULP_inst->cb_index[i][k][ulp+2]);
-+                dopack( &pbytes, firstpart, 
-+                    iLBCenc_inst->ULP_inst->cb_index[i][k][ulp], 
-+                    &pos);
-+            }
-+        }
-+        
-+        for (i=0; i<iLBCenc_inst->nasub; i++) {
-+            for (k=0; k<CB_NSTAGES; k++) {
-+
-+
-+                packsplit(gain_index+i*CB_NSTAGES+k, &firstpart, 
-+                    gain_index+i*CB_NSTAGES+k, 
-+                    iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], 
-+                    iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp]+
-+                    iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+1]+
-+                    iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp+2]);
-+                dopack( &pbytes, firstpart, 
-+                    iLBCenc_inst->ULP_inst->cb_gain[i][k][ulp], 
-+                    &pos);
-+            }
-+        }
-+    }
-+
-+    /* set the last bit to zero (otherwise the decoder 
-+       will treat it as a lost frame) */
-+    dopack( &pbytes, 0, 1, &pos);
-+}
-+
-+
-+
-diff -druN codecs/ilbc.orig/iLBC_encode.h codecs/ilbc/iLBC_encode.h
---- codecs/ilbc.orig/iLBC_encode.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/iLBC_encode.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,37 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    iLBC_encode.h    
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_ILBCENCODE_H
-+#define __iLBC_ILBCENCODE_H
-+
-+#include "iLBC_define.h"
-+
-+short initEncode(                   /* (o) Number of bytes 
-+                                           encoded */
-+    iLBC_Enc_Inst_t *iLBCenc_inst,  /* (i/o) Encoder instance */
-+    int mode                    /* (i) frame size mode */
-+);
-+
-+void iLBC_encode(
-+
-+
-+    unsigned char *bytes,           /* (o) encoded data bits iLBC */
-+    float *block,                   /* (o) speech vector to 
-+                                           encode */
-+    iLBC_Enc_Inst_t *iLBCenc_inst   /* (i/o) the general encoder 
-+                                           state */
-+);
-+
-+#endif
-+
-+
-+
-Files codecs/ilbc.orig/libilbc.a and codecs/ilbc/libilbc.a differ
-diff -druN codecs/ilbc.orig/libilbc.vcproj codecs/ilbc/libilbc.vcproj
---- codecs/ilbc.orig/libilbc.vcproj	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/libilbc.vcproj	2006-03-20 13:25:50.000000000 -0800
-@@ -0,0 +1,353 @@
-+<?xml version="1.0" encoding="Windows-1252"?>
-+<VisualStudioProject
-+	ProjectType="Visual C++"
-+	Version="8.00"
-+	Name="libilbc"
-+	ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}"
-+	RootNamespace="libilbc"
-+	Keyword="Win32Proj"
-+	>
-+	<Platforms>
-+		<Platform
-+			Name="Win32"
-+		/>
-+	</Platforms>
-+	<ToolFiles>
-+	</ToolFiles>
-+	<Configurations>
-+		<Configuration
-+			Name="Debug|Win32"
-+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			CharacterSet="1"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				Optimization="0"
-+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-+				MinimalRebuild="true"
-+				BasicRuntimeChecks="3"
-+				RuntimeLibrary="3"
-+				UsePrecompiledHeader="0"
-+				WarningLevel="3"
-+				Detect64BitPortabilityProblems="true"
-+				DebugInformationFormat="4"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+			/>
-+		</Configuration>
-+		<Configuration
-+			Name="Release|Win32"
-+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-+			IntermediateDirectory="$(ConfigurationName)"
-+			ConfigurationType="4"
-+			CharacterSet="1"
-+			WholeProgramOptimization="1"
-+			>
-+			<Tool
-+				Name="VCPreBuildEventTool"
-+			/>
-+			<Tool
-+				Name="VCCustomBuildTool"
-+			/>
-+			<Tool
-+				Name="VCXMLDataGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCWebServiceProxyGeneratorTool"
-+			/>
-+			<Tool
-+				Name="VCMIDLTool"
-+			/>
-+			<Tool
-+				Name="VCCLCompilerTool"
-+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-+				RuntimeLibrary="2"
-+				UsePrecompiledHeader="0"
-+				WarningLevel="3"
-+				Detect64BitPortabilityProblems="true"
-+				DebugInformationFormat="3"
-+			/>
-+			<Tool
-+				Name="VCManagedResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCResourceCompilerTool"
-+			/>
-+			<Tool
-+				Name="VCPreLinkEventTool"
-+			/>
-+			<Tool
-+				Name="VCLibrarianTool"
-+			/>
-+			<Tool
-+				Name="VCALinkTool"
-+			/>
-+			<Tool
-+				Name="VCXDCMakeTool"
-+			/>
-+			<Tool
-+				Name="VCBscMakeTool"
-+			/>
-+			<Tool
-+				Name="VCFxCopTool"
-+			/>
-+			<Tool
-+				Name="VCPostBuildEventTool"
-+			/>
-+		</Configuration>
-+	</Configurations>
-+	<References>
-+	</References>
-+	<Files>
-+		<Filter
-+			Name="Source Files"
-+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-+			>
-+			<File
-+				RelativePath=".\anaFilter.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\constants.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\createCB.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\doCPLC.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\enhancer.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\filter.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\FrameClassify.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\gainquant.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\getCBvec.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\helpfun.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\hpInput.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\hpOutput.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iCBConstruct.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iCBSearch.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iLBC_decode.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iLBC_encode.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\LPCdecode.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\LPCencode.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\lsf.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\packing.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\StateConstructW.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\StateSearchW.c"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\syntFilter.c"
-+				>
-+			</File>
-+		</Filter>
-+		<Filter
-+			Name="Header Files"
-+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-+			>
-+			<File
-+				RelativePath=".\anaFilter.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\constants.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\createCB.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\doCPLC.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\enhancer.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\filter.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\FrameClassify.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\gainquant.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\getCBvec.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\helpfun.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\hpInput.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\hpOutput.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iCBConstruct.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iCBSearch.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iLBC_decode.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iLBC_define.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\iLBC_encode.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\LPCdecode.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\LPCencode.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\lsf.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\packing.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\StateConstructW.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\StateSearchW.h"
-+				>
-+			</File>
-+			<File
-+				RelativePath=".\syntFilter.h"
-+				>
-+			</File>
-+		</Filter>
-+		<Filter
-+			Name="Resource Files"
-+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-+			>
-+		</Filter>
-+	</Files>
-+	<Globals>
-+	</Globals>
-+</VisualStudioProject>
-diff -druN codecs/ilbc.orig/lsf.c codecs/ilbc/lsf.c
---- codecs/ilbc.orig/lsf.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/lsf.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,264 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    lsf.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <string.h>
-+#include <math.h>
-+
-+#include "iLBC_define.h"
-+#include "lsf.h"
-+
-+/*----------------------------------------------------------------*
-+ *  conversion from lpc coefficients to lsf coefficients 
-+ *---------------------------------------------------------------*/
-+
-+void a2lsf( 
-+    float *freq,/* (o) lsf coefficients */
-+    float *a    /* (i) lpc coefficients */
-+){
-+    float steps[LSF_NUMBER_OF_STEPS] = 
-+        {(float)0.00635, (float)0.003175, (float)0.0015875, 
-+        (float)0.00079375};
-+    float step;
-+    int step_idx;
-+    int lsp_index;  
-+    float p[LPC_HALFORDER];
-+    float q[LPC_HALFORDER];
-+    float p_pre[LPC_HALFORDER];
-+
-+
-+    float q_pre[LPC_HALFORDER];
-+    float old_p, old_q, *old;
-+    float *pq_coef; 
-+    float omega, old_omega;
-+    int i;
-+    float hlp, hlp1, hlp2, hlp3, hlp4, hlp5;
-+
-+    for (i=0; i<LPC_HALFORDER; i++) {
-+        p[i] = (float)-1.0 * (a[i + 1] + a[LPC_FILTERORDER - i]);
-+        q[i] = a[LPC_FILTERORDER - i] - a[i + 1];
-+    }
-+    
-+    p_pre[0] = (float)-1.0 - p[0];
-+    p_pre[1] = - p_pre[0] - p[1];
-+    p_pre[2] = - p_pre[1] - p[2];
-+    p_pre[3] = - p_pre[2] - p[3];
-+    p_pre[4] = - p_pre[3] - p[4];
-+    p_pre[4] = p_pre[4] / 2;
-+    
-+    q_pre[0] = (float)1.0 - q[0];
-+    q_pre[1] = q_pre[0] - q[1];
-+    q_pre[2] = q_pre[1] - q[2];
-+    q_pre[3] = q_pre[2] - q[3];
-+    q_pre[4] = q_pre[3] - q[4];
-+    q_pre[4] = q_pre[4] / 2;
-+    
-+    omega = 0.0;
-+    old_omega = 0.0;
-+
-+    old_p = FLOAT_MAX;
-+    old_q = FLOAT_MAX;
-+    
-+    /* Here we loop through lsp_index to find all the 
-+       LPC_FILTERORDER roots for omega. */  
-+
-+    for (lsp_index = 0; lsp_index<LPC_FILTERORDER; lsp_index++) {
-+        
-+        /* Depending on lsp_index being even or odd, we 
-+        alternatively solve the roots for the two LSP equations. */
-+
-+        
-+        if ((lsp_index & 0x1) == 0) {
-+            pq_coef = p_pre;
-+            old = &old_p;
-+        } else {
-+            pq_coef = q_pre;
-+            old = &old_q;
-+        }
-+        
-+        /* Start with low resolution grid */
-+
-+        for (step_idx = 0, step = steps[step_idx]; 
-+            step_idx < LSF_NUMBER_OF_STEPS;){
-+            
-+
-+
-+            /*  cos(10piw) + pq(0)cos(8piw) + pq(1)cos(6piw) + 
-+            pq(2)cos(4piw) + pq(3)cod(2piw) + pq(4) */
-+
-+            hlp = (float)cos(omega * TWO_PI);
-+            hlp1 = (float)2.0 * hlp + pq_coef[0];
-+            hlp2 = (float)2.0 * hlp * hlp1 - (float)1.0 + 
-+                pq_coef[1];
-+            hlp3 = (float)2.0 * hlp * hlp2 - hlp1 + pq_coef[2];
-+            hlp4 = (float)2.0 * hlp * hlp3 - hlp2 + pq_coef[3];
-+            hlp5 = hlp * hlp4 - hlp3 + pq_coef[4];
-+            
-+            
-+            if (((hlp5 * (*old)) <= 0.0) || (omega >= 0.5)){
-+                
-+                if (step_idx == (LSF_NUMBER_OF_STEPS - 1)){
-+                    
-+                    if (fabs(hlp5) >= fabs(*old)) {
-+                        freq[lsp_index] = omega - step;
-+                    } else {
-+                        freq[lsp_index] = omega;
-+                    }   
-+                    
-+                    
-+                    if ((*old) >= 0.0){
-+                        *old = (float)-1.0 * FLOAT_MAX;
-+                    } else {
-+                        *old = FLOAT_MAX;
-+                    }
-+
-+                    omega = old_omega;
-+                    step_idx = 0;
-+                    
-+                    step_idx = LSF_NUMBER_OF_STEPS;
-+                } else {
-+                    
-+                    if (step_idx == 0) {
-+                        old_omega = omega;
-+                    }
-+
-+                    step_idx++;
-+                    omega -= steps[step_idx];
-+
-+                    /* Go back one grid step */
-+
-+                    step = steps[step_idx];
-+                }
-+            } else {
-+                
-+            /* increment omega until they are of different sign, 
-+            and we know there is at least one root between omega 
-+            and old_omega */
-+                *old = hlp5;
-+                omega += step;
-+            }
-+
-+
-+        }
-+    }
-+
-+    for (i = 0; i<LPC_FILTERORDER; i++) {
-+        freq[i] = freq[i] * TWO_PI;
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  conversion from lsf coefficients to lpc coefficients 
-+ *---------------------------------------------------------------*/
-+
-+void lsf2a( 
-+    float *a_coef,  /* (o) lpc coefficients */
-+    float *freq     /* (i) lsf coefficients */
-+){
-+    int i, j;
-+    float hlp;
-+    float p[LPC_HALFORDER], q[LPC_HALFORDER];
-+    float a[LPC_HALFORDER + 1], a1[LPC_HALFORDER],
-+        a2[LPC_HALFORDER];
-+    float b[LPC_HALFORDER + 1], b1[LPC_HALFORDER], 
-+        b2[LPC_HALFORDER];
-+
-+    for (i=0; i<LPC_FILTERORDER; i++) {
-+        freq[i] = freq[i] * PI2;
-+    }
-+
-+    /* Check input for ill-conditioned cases.  This part is not 
-+    found in the TIA standard.  It involves the following 2 IF 
-+    blocks. If "freq" is judged ill-conditioned, then we first 
-+    modify freq[0] and freq[LPC_HALFORDER-1] (normally 
-+    LPC_HALFORDER = 10 for LPC applications), then we adjust 
-+    the other "freq" values slightly */
-+
-+    
-+    if ((freq[0] <= 0.0) || (freq[LPC_FILTERORDER - 1] >= 0.5)){
-+
-+        
-+        if (freq[0] <= 0.0) {
-+            freq[0] = (float)0.022;
-+        }
-+
-+        
-+        if (freq[LPC_FILTERORDER - 1] >= 0.5) {
-+            freq[LPC_FILTERORDER - 1] = (float)0.499;
-+        }
-+
-+        hlp = (freq[LPC_FILTERORDER - 1] - freq[0]) / 
-+            (float) (LPC_FILTERORDER - 1);
-+
-+        for (i=1; i<LPC_FILTERORDER; i++) {
-+            freq[i] = freq[i - 1] + hlp;
-+        }
-+
-+
-+    }
-+    
-+    memset(a1, 0, LPC_HALFORDER*sizeof(float));
-+    memset(a2, 0, LPC_HALFORDER*sizeof(float));
-+    memset(b1, 0, LPC_HALFORDER*sizeof(float));
-+    memset(b2, 0, LPC_HALFORDER*sizeof(float));
-+    memset(a, 0, (LPC_HALFORDER+1)*sizeof(float));
-+    memset(b, 0, (LPC_HALFORDER+1)*sizeof(float));
-+        
-+    /* p[i] and q[i] compute cos(2*pi*omega_{2j}) and 
-+    cos(2*pi*omega_{2j-1} in eqs. 4.2.2.2-1 and 4.2.2.2-2.  
-+    Note that for this code p[i] specifies the coefficients 
-+    used in .Q_A(z) while q[i] specifies the coefficients used 
-+    in .P_A(z) */
-+
-+    for (i=0; i<LPC_HALFORDER; i++) {
-+        p[i] = (float)cos(TWO_PI * freq[2 * i]);
-+        q[i] = (float)cos(TWO_PI * freq[2 * i + 1]);
-+    }
-+    
-+    a[0] = 0.25;
-+    b[0] = 0.25;
-+    
-+    for (i= 0; i<LPC_HALFORDER; i++) {
-+        a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-+        b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-+        a2[i] = a1[i];
-+        a1[i] = a[i];
-+        b2[i] = b1[i];
-+        b1[i] = b[i];
-+    }
-+    
-+    for (j=0; j<LPC_FILTERORDER; j++) {
-+        
-+        if (j == 0) {
-+            a[0] = 0.25;
-+            b[0] = -0.25;
-+        } else {
-+            a[0] = b[0] = 0.0;
-+        }
-+        
-+        for (i=0; i<LPC_HALFORDER; i++) {
-+            a[i + 1] = a[i] - 2 * p[i] * a1[i] + a2[i];
-+            b[i + 1] = b[i] - 2 * q[i] * b1[i] + b2[i];
-+            a2[i] = a1[i];
-+            a1[i] = a[i];
-+            b2[i] = b1[i];
-+            b1[i] = b[i];
-+        }
-+
-+        a_coef[j + 1] = 2 * (a[LPC_HALFORDER] + b[LPC_HALFORDER]);
-+    }
-+
-+    a_coef[0] = 1.0;
-+
-+
-+}
-+
-+
-diff -druN codecs/ilbc.orig/lsf.h codecs/ilbc/lsf.h
---- codecs/ilbc.orig/lsf.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/lsf.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,30 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    lsf.h             
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_LSF_H
-+#define __iLBC_LSF_H
-+
-+void a2lsf( 
-+    float *freq,/* (o) lsf coefficients */
-+    float *a    /* (i) lpc coefficients */
-+);
-+
-+void lsf2a( 
-+    float *a_coef,  /* (o) lpc coefficients */
-+    float *freq     /* (i) lsf coefficients */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/packing.c codecs/ilbc/packing.c
---- codecs/ilbc.orig/packing.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/packing.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,175 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    packing.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include <math.h>
-+#include <stdlib.h>
-+
-+#include "iLBC_define.h"
-+#include "constants.h"
-+#include "helpfun.h"
-+#include "packing.h"
-+#include "string.h"
-+
-+/*----------------------------------------------------------------*
-+ *  splitting an integer into first most significant bits and 
-+ *  remaining least significant bits
-+ *---------------------------------------------------------------*/
-+
-+void packsplit(
-+    int *index,                 /* (i) the value to split */
-+    int *firstpart,             /* (o) the value specified by most 
-+                                       significant bits */
-+    int *rest,                  /* (o) the value specified by least
-+                                       significant bits */
-+    int bitno_firstpart,    /* (i) number of bits in most 
-+                                       significant part */
-+    int bitno_total             /* (i) number of bits in full range
-+                                       of value */
-+){
-+    int bitno_rest = bitno_total-bitno_firstpart;
-+
-+
-+
-+    *firstpart = *index>>(bitno_rest);
-+    *rest = *index-(*firstpart<<(bitno_rest));
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  combining a value corresponding to msb's with a value 
-+ *  corresponding to lsb's
-+ *---------------------------------------------------------------*/
-+
-+void packcombine( 
-+    int *index,                 /* (i/o) the msb value in the 
-+                                       combined value out */
-+    int rest,                   /* (i) the lsb value */
-+    int bitno_rest              /* (i) the number of bits in the 
-+                                       lsb part */
-+){
-+    *index = *index<<bitno_rest;
-+    *index += rest;
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  packing of bits into bitstream, i.e., vector of bytes
-+ *---------------------------------------------------------------*/
-+
-+void dopack( 
-+    unsigned char **bitstream,  /* (i/o) on entrance pointer to 
-+                                       place in bitstream to pack 
-+                                       new data, on exit pointer 
-+                                       to place in bitstream to 
-+                                       pack future data */
-+    int index,                  /* (i) the value to pack */
-+    int bitno,                  /* (i) the number of bits that the 
-+                                       value will fit within */
-+    int *pos                /* (i/o) write position in the 
-+                                       current byte */
-+){
-+    int posLeft;
-+    
-+    /* Clear the bits before starting in a new byte */
-+    
-+    if ((*pos)==0) {
-+        **bitstream=0;
-+    }
-+
-+    while (bitno>0) {
-+        
-+        /* Jump to the next byte if end of this byte is reached*/
-+        
-+        if (*pos==8) {
-+            *pos=0;
-+            (*bitstream)++;
-+            **bitstream=0;
-+        }
-+
-+
-+
-+        posLeft=8-(*pos);
-+
-+        /* Insert index into the bitstream */
-+        
-+        if (bitno <= posLeft) {
-+            **bitstream |= (unsigned char)(index<<(posLeft-bitno));
-+            *pos+=bitno;
-+            bitno=0;
-+        } else {
-+            **bitstream |= (unsigned char)(index>>(bitno-posLeft));
-+            
-+            *pos=8;
-+            index-=((index>>(bitno-posLeft))<<(bitno-posLeft));
-+            
-+            bitno-=posLeft;
-+        }
-+    }
-+}
-+
-+/*----------------------------------------------------------------*
-+ *  unpacking of bits from bitstream, i.e., vector of bytes
-+ *---------------------------------------------------------------*/
-+
-+void unpack( 
-+    unsigned char **bitstream,  /* (i/o) on entrance pointer to 
-+                                       place in bitstream to 
-+                                       unpack new data from, on 
-+                                       exit pointer to place in 
-+                                       bitstream to unpack future 
-+                                       data from */
-+    int *index,                 /* (o) resulting value */
-+    int bitno,                  /* (i) number of bits used to 
-+                                       represent the value */
-+    int *pos                /* (i/o) read position in the 
-+                                       current byte */
-+){
-+    int BitsLeft;
-+
-+    *index=0;
-+
-+    while (bitno>0) {
-+        
-+        /* move forward in bitstream when the end of the 
-+           byte is reached */
-+        
-+        if (*pos==8) {
-+            *pos=0;
-+            (*bitstream)++;
-+        }
-+
-+        BitsLeft=8-(*pos);
-+
-+        /* Extract bits to index */
-+        
-+
-+
-+        if (BitsLeft>=bitno) {
-+            *index+=((((**bitstream)<<(*pos)) & 0xFF)>>(8-bitno));
-+            
-+            *pos+=bitno;
-+            bitno=0;
-+        } else {
-+            
-+            if ((8-bitno)>0) {
-+                *index+=((((**bitstream)<<(*pos)) & 0xFF)>>
-+                    (8-bitno));
-+                *pos=8;
-+            } else {
-+                *index+=(((int)(((**bitstream)<<(*pos)) & 0xFF))<<
-+                    (bitno-8));
-+                *pos=8;
-+            }
-+            bitno-=BitsLeft;
-+        }
-+    }
-+}
-+
-+
-diff -druN codecs/ilbc.orig/packing.h codecs/ilbc/packing.h
---- codecs/ilbc.orig/packing.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/packing.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,67 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    packing.h              
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __PACKING_H
-+#define __PACKING_H
-+
-+void packsplit(
-+    int *index,                 /* (i) the value to split */
-+    int *firstpart,             /* (o) the value specified by most 
-+                                       significant bits */
-+    int *rest,                  /* (o) the value specified by least 
-+                                       significant bits */
-+    int bitno_firstpart,    /* (i) number of bits in most 
-+                                       significant part */
-+    int bitno_total             /* (i) number of bits in full range 
-+                                       of value */
-+);
-+
-+void packcombine( 
-+    int *index,                 /* (i/o) the msb value in the 
-+                                       combined value out */
-+    int rest,                   /* (i) the lsb value */
-+    int bitno_rest              /* (i) the number of bits in the 
-+                                       lsb part */
-+);
-+
-+void dopack( 
-+    unsigned char **bitstream,  /* (i/o) on entrance pointer to 
-+                                       place in bitstream to pack 
-+                                       new data, on exit pointer 
-+                                       to place in bitstream to 
-+                                       pack future data */
-+    int index,                  /* (i) the value to pack */
-+    int bitno,                  /* (i) the number of bits that the 
-+                                       value will fit within */
-+    int *pos                /* (i/o) write position in the 
-+                                       current byte */
-+);
-+
-+void unpack( 
-+    unsigned char **bitstream,  /* (i/o) on entrance pointer to 
-+
-+
-+                                       place in bitstream to 
-+                                       unpack new data from, on 
-+                                       exit pointer to place in 
-+                                       bitstream to unpack future 
-+                                       data from */
-+    int *index,                 /* (o) resulting value */
-+    int bitno,                  /* (i) number of bits used to 
-+                                       represent the value */
-+    int *pos                /* (i/o) read position in the 
-+                                       current byte */
-+);
-+
-+#endif
-+
-+
-diff -druN codecs/ilbc.orig/syntFilter.c codecs/ilbc/syntFilter.c
---- codecs/ilbc.orig/syntFilter.c	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/syntFilter.c	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,108 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    syntFilter.c 
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#include "iLBC_define.h"
-+#include "syntFilter.h"
-+
-+/*----------------------------------------------------------------*
-+ *  LP synthesis filter.
-+ *---------------------------------------------------------------*/
-+    
-+void syntFilter(
-+    float *Out,     /* (i/o) Signal to be filtered */
-+    float *a,       /* (i) LP parameters */
-+    int len,    /* (i) Length of signal */
-+    float *mem      /* (i/o) Filter state */
-+){
-+    int i, j;
-+    float *po, *pi, *pa, *pm;
-+
-+    po=Out;
-+
-+    /* Filter first part using memory from past */
-+
-+    for (i=0; i<LPC_FILTERORDER; i++) {
-+        pi=&Out[i-1];
-+        pa=&a[1];
-+        pm=&mem[LPC_FILTERORDER-1];
-+        for (j=1; j<=i; j++) {
-+            *po-=(*pa++)*(*pi--);
-+        }
-+        for (j=i+1; j<LPC_FILTERORDER+1; j++) {
-+            *po-=(*pa++)*(*pm--);
-+        }
-+        po++;
-+    }
-+
-+    /* Filter last part where the state is entierly in 
-+       the output vector */
-+    
-+    for (i=LPC_FILTERORDER; i<len; i++) {
-+
-+
-+        pi=&Out[i-1];
-+        pa=&a[1];
-+        for (j=1; j<LPC_FILTERORDER+1; j++) {
-+            *po-=(*pa++)*(*pi--);
-+        }
-+        po++;
-+    }
-+
-+    /* Update state vector */
-+
-+    memcpy(mem, &Out[len-LPC_FILTERORDER], 
-+        LPC_FILTERORDER*sizeof(float));
-+}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h
---- codecs/ilbc.orig/syntFilter.h	1969-12-31 16:00:00.000000000 -0800
-+++ codecs/ilbc/syntFilter.h	2006-02-14 11:14:15.000000000 -0800
-@@ -0,0 +1,27 @@
-+
-+/******************************************************************
-+
-+    iLBC Speech Coder ANSI-C Source Code
-+
-+    syntFilter.h               
-+
-+    Copyright (C) The Internet Society (2004). 
-+    All Rights Reserved.
-+
-+******************************************************************/
-+
-+#ifndef __iLBC_SYNTFILTER_H
-+#define __iLBC_SYNTFILTER_H
-+
-+void syntFilter(
-+    float *Out,     /* (i/o) Signal to be filtered */
-+    float *a,       /* (i) LP parameters */
-+    int len,    /* (i) Length of signal */
-+    float *mem      /* (i/o) Filter state */
-+
-+
-+);
-+
-+#endif
-+
-+
---- codecs/.moduleinfo	2008/08/20 23:00:58	1.1
-+++ codecs/.moduleinfo	2008/08/20 23:01:12
-@@ -11,7 +11,6 @@
- 	<depend>gsm</depend>
- </member>
- <member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
- </member>
diff --git a/net/asterisk14/files/nocodecnego-patch-Makefile b/net/asterisk14/files/nocodecnego-patch-Makefile
deleted file mode 100644
index f0dff261d917..000000000000
--- a/net/asterisk14/files/nocodecnego-patch-Makefile
+++ /dev/null
@@ -1,222 +0,0 @@
---- Makefile.orig	2009-10-23 17:00:01.000000000 +0300
-+++ Makefile	2009-11-23 16:44:36.000000000 +0200
-@@ -101,7 +101,7 @@
- OVERWRITE=y
- 
- # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g3
-+#DEBUG=-g3
- 
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -135,7 +135,7 @@
-   ASTMANDIR=$(mandir)
- ifneq ($(findstring BSD,$(OSARCH)),)
-   ASTVARLIBDIR=$(prefix)/share/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-+  ASTVARRUNDIR=$(localstatedir)/run
- else
-   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- endif
-@@ -225,9 +225,11 @@
-   _ASTLDFLAGS+=-L/usr/local/lib
- endif
- 
-+ifneq ($(OSARCH),FreeBSD)
- ifneq ($(PROC),ultrasparc)
-   _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- endif
-+endif
- 
- ifeq ($(PROC),ppc)
-   _ASTCFLAGS+=-fsigned-char
-@@ -235,7 +237,7 @@
- 
- ifeq ($(OSARCH),FreeBSD)
-   # -V is understood by BSD Make, not by GNU make.
--  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+  BSDVERSION=$(OSVERSION)
-   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- endif
-@@ -410,18 +412,18 @@
- 
- datafiles: _all
-	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail?  There are portions here that *could* be customized but might also be
- # improved a lot.  I'll put it here for now.
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
- 	for x in static-http/*; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 	$(MAKE) -C sounds install
- 
- update: 
-@@ -445,47 +447,47 @@
- OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
- 
- installdirs:
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
- 
- bininstall: _all installdirs $(SUBDIRS_INSTALL)
--	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
- 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
--	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
--	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
--		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
-+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
-+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- 	fi
--	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
--	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
--	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	if [ -n "$(OLDHEADERS)" ]; then \
- 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- 	fi
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
--	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
-+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
--		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
- 	fi
- 
- $(SUBDIRS_INSTALL):
-@@ -521,7 +523,7 @@
- 	@exit 1
- endif
- 
--install: badshell datafiles bininstall
-+install: badshell datafiles bininstall samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi
-@@ -559,31 +561,23 @@
- upgrade: bininstall
- 
- adsi:
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
- 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
--			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
- 		fi ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
- 	done
- 
- samples: adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
--			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
--					echo "Config file $$x is unchanged"; \
--					continue; \
--				fi ; \
--				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
--			else \
--				echo "Skipping config file $$x"; \
--				continue; \
--			fi ;\
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
-+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
- 		fi ; \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
- 	done
--	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+	if true; then \
- 		( \
- 		echo "[directories]" ; \
- 		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -629,20 +623,23 @@
- 		echo ";astctlowner = root" ; \
- 		echo ";astctlgroup = apache" ; \
- 		echo ";astctl = asterisk.ctl" ; \
--		) > $(DESTDIR)$(ASTCONFPATH) ; \
-+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
-+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+			cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
-+		fi; \
- 	else \
- 		echo "Skipping asterisk.conf creation"; \
- 	fi
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
- 
- webvmail:
- 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
- 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- 	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
--	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
-+	$(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- 	for x in images/*.gif; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
- 	done
- 	@echo " +--------- Asterisk Web Voicemail ----------+"  
- 	@echo " +                                           +"
diff --git a/net/asterisk14/files/patch-Makefile.rules b/net/asterisk14/files/patch-Makefile.rules
deleted file mode 100644
index f90430ec9ddd..000000000000
--- a/net/asterisk14/files/patch-Makefile.rules
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.rules.orig	2009-09-28 22:09:25.000000000 +0300
-+++ Makefile.rules	2009-11-23 16:15:23.000000000 +0200
-@@ -37,11 +37,13 @@
- 
- OPTIMIZE?=-O6
- 
-+ifneq ($(OSARCH),FreeBSD)
- ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
-     _ASTCFLAGS+=$(OPTIMIZE)
- else
-     _ASTCFLAGS+=-O0
- endif
-+endif
- 
- # shortcuts for common combinations of flags; these must be recursively expanded so that
- # per-target settings will be applied
diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile
deleted file mode 100644
index f9910fe96dd6..000000000000
--- a/net/asterisk14/files/patch-agi::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- agi/Makefile.orig	Sat Dec 16 23:14:34 2006
-+++ agi/Makefile	Wed Mar 28 11:13:21 2007
-@@ -13,7 +13,9 @@
- 
- .PHONY: clean all uninstall
- 
--AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi jukebox.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- ifeq ($(OSARCH),SunOS)
-   LIBS+=-lsocket -lnsl
-@@ -31,8 +33,9 @@ eagi-test: eagi-test.o strcompat.o
- eagi-sphinx-test: eagi-sphinx-test.o
- 
- install: all
--	mkdir -p $(DESTDIR)$(AGI_DIR)
--	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
-+	$(MKDIR) -p $(DESTDIR)$(AGI_DIR)
-+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
-+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
- 
- uninstall:
- 	for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
deleted file mode 100644
index bb9d20047899..000000000000
--- a/net/asterisk14/files/patch-channels::Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
---- channels/Makefile.orig	2009-07-21 16:04:44.000000000 +0300
-+++ channels/Makefile	2009-11-20 18:05:45.000000000 +0200
-@@ -32,9 +32,10 @@
- endif
- 
- ifeq ($(OSARCH),FreeBSD)
--  PTLIB=-lpt_FreeBSD_x86_r
--  H323LIB=-lh323_FreeBSD_x86_r
-+  PTLIB=-lpt_r
-+  H323LIB=-lh323_r
-   CHANH323LIB=-pthread
-+  H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
- endif
- 
- ifeq ($(OSARCH),NetBSD)
-@@ -78,12 +79,13 @@
- h323/libchanh323.a h323/Makefile.ast:
- 	$(CMD_PREFIX) $(MAKE) -C h323
- 	$(CMD_PREFIX) rm -f ../main/asterisk
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) exit 1
-+	$(CMD_PREFIX) $(MAKE) -C . chan_h323.so
-+#	$(CMD_PREFIX) echo "***************************************************************"
-+#	$(CMD_PREFIX) echo
-+#	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
-+#	$(CMD_PREFIX) echo
-+#	$(CMD_PREFIX) echo "***************************************************************"
-+#	$(CMD_PREFIX) exit 1
- endif
- 
- dist-clean::
-@@ -111,8 +113,12 @@
- else
- chan_h323.so: chan_h323.o h323/libchanh323.a
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-+ifeq ($(OSARCH),FreeBSD)
-+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
-+else
- 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat $(ASTLDFLAGS)
- endif
-+endif
- 
- chan_misdn.o: _ASTCFLAGS+=-Imisdn
- 
diff --git a/net/asterisk14/files/patch-channels::chan_sip.c b/net/asterisk14/files/patch-channels::chan_sip.c
deleted file mode 100644
index 9bb8267ffcc5..000000000000
--- a/net/asterisk14/files/patch-channels::chan_sip.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/chan_sip.c.orig	2008-06-10 00:46:46.000000000 -0700
-+++ channels/chan_sip.c	2008-06-10 00:46:46.000000000 -0700
-@@ -496,7 +496,7 @@
- #define DEFAULT_MOHINTERPRET    "default"
- #define DEFAULT_MOHSUGGEST      ""
- #define DEFAULT_VMEXTEN 	"asterisk"
--#define DEFAULT_CALLERID 	"asterisk"
-+#define DEFAULT_CALLERID 	"Unknown"
- #define DEFAULT_NOTIFYMIME 	"application/simple-message-summary"
- #define DEFAULT_MWITIME 	10
- #define DEFAULT_ALLOWGUEST	TRUE
diff --git a/net/asterisk14/files/patch-channels_h323_Makefile.in b/net/asterisk14/files/patch-channels_h323_Makefile.in
deleted file mode 100644
index 105eb3c41547..000000000000
--- a/net/asterisk14/files/patch-channels_h323_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/Makefile.in
-+++ channels/h323/Makefile.in
-@@ -13,7 +13,7 @@
- STDCCFLAGS	+= -I../../include -include ../../include/asterisk/autoconfig.h
- STDCCFLAGS	+= -fPIC
- #OPTCCFLAGS	+=
--CFLAGS		= -pipe
-+CFLAGS		= -pipe @CXXFLAGS@
- TARGET		= libchanh323.a
- TARGET		+= Makefile.ast
- SOURCES		= ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx
diff --git a/net/asterisk14/files/patch-configure b/net/asterisk14/files/patch-configure
deleted file mode 100644
index c94b169ad3d4..000000000000
--- a/net/asterisk14/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	2010-09-10 07:13:45.000000000 +0700
-+++ configure	2010-11-30 00:38:53.000000000 +0600
-@@ -4017,9 +4017,6 @@
- 
- case "${host_os}" in
-      freebsd*)
--
--     CPPFLAGS=-I/usr/local/include
--     LDFLAGS=-L/usr/local/lib
-      ;;
-      darwin*)
- 
-@@ -29664,7 +29661,7 @@
- 
- 	fi
- 
--	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-+	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
- 
- 	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5
diff --git a/net/asterisk14/files/patch-include::asterisk::utils.h b/net/asterisk14/files/patch-include::asterisk::utils.h
deleted file mode 100644
index a06f7d065c84..000000000000
--- a/net/asterisk14/files/patch-include::asterisk::utils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- include/asterisk/utils.h	2004/10/10 12:55:50	1.1
-+++ include/asterisk/utils.h	2004/10/10 12:56:43
-@@ -37,7 +37,6 @@
- #ifdef inet_ntoa
- #undef inet_ntoa
- #endif
--#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__
- 
- #ifdef LINUX
- #define ast_pthread_create pthread_create
diff --git a/net/asterisk14/files/patch-main::Makefile b/net/asterisk14/files/patch-main::Makefile
deleted file mode 100644
index 621b9ebb8f58..000000000000
--- a/net/asterisk14/files/patch-main::Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- main/Makefile.orig	2009-08-01 03:52:00.000000000 +0300
-+++ main/Makefile	2009-11-20 18:09:06.000000000 +0200
-@@ -92,8 +92,8 @@
- 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=)) $(ASTCFLAGS)" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a:
--	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
-+#db1-ast/libdb1.a:
-+#	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
- 
- ast_expr2.c ast_expr2.h:
- 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
-@@ -127,18 +127,18 @@
-   H323LDLIBS=
- endif
- 
--asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports
-+asterisk: $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) asterisk.exports
- 	@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
- 	@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
- 		mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \
- 	fi
- 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
- 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
--	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
-+	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@"
- ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
-+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
- else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
-+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
- endif
- 
- clean::
diff --git a/net/asterisk14/files/patch-main::db.c b/net/asterisk14/files/patch-main::db.c
deleted file mode 100644
index 0b26f3b2cca6..000000000000
--- a/net/asterisk14/files/patch-main::db.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- main/db.c.orig	Fri Jan 13 11:05:32 2006
-+++ main/db.c	Fri Jan 13 11:06:55 2006
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <dirent.h>
-+#include <db.h>
- 
- #include "asterisk.h"
- 
-@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include "asterisk/utils.h"
- #include "asterisk/lock.h"
- #include "asterisk/manager.h"
--#include "db1-ast/include/db.h"
- 
- #ifdef __CYGWIN__
- #define dbopen __dbopen
diff --git a/net/asterisk14/files/patch-main::frame.c b/net/asterisk14/files/patch-main::frame.c
deleted file mode 100644
index 232de08a9e21..000000000000
--- a/net/asterisk14/files/patch-main::frame.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- main/frame.c.orig	Wed Jan 25 13:22:43 2006
-+++ main/frame.c	Wed Jan 25 13:21:25 2006
-@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf)
- {
- 	switch(buf & TYPE_MASK) {
- 	case TYPE_DONTSEND:
--		return 0;
-+		return 2;
- 		break;
- 	case TYPE_SILENCE:
- 		return 4;
diff --git a/net/asterisk14/files/patch-main::utils.c b/net/asterisk14/files/patch-main::utils.c
deleted file mode 100644
index 7f2f1495d714..000000000000
--- a/net/asterisk14/files/patch-main::utils.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- main/utils.c.orig
-+++ main/utils.c
-@@ -914,8 +914,8 @@
- 		pthread_attr_init(attr);
- 	}
- 
--#ifdef __linux__
--	/* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
-+#if defined(__linux__) || defined(__FreeBSD__)
-+	/* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
- 	   which is kind of useless. Change this here to
- 	   PTHREAD_INHERIT_SCHED; that way the -p option to set realtime
- 	   priority will propagate down to new threads by default.
diff --git a/net/asterisk14/files/patch-rtp_timeout b/net/asterisk14/files/patch-rtp_timeout
deleted file mode 100644
index 6f60c74cff41..000000000000
--- a/net/asterisk14/files/patch-rtp_timeout
+++ /dev/null
@@ -1,25 +0,0 @@
---- channels/chan_sip.c.orig	2009-04-14 08:58:13.000000000 +0100
-+++ channels/chan_sip.c	2009-04-14 09:00:58.000000000 +0100
-@@ -16287,7 +16287,6 @@
- restartsearch:		
- 		/* Check for interfaces needing to be killed */
- 		ast_mutex_lock(&iflock);
--		t = time(NULL);
- 		/* don't scan the interface list if it hasn't been a reasonable period
- 		   of time since the last time we did it (when MWI is being sent, we can
- 		   get back to this point every millisecond or less)
-@@ -16306,12 +16305,14 @@
- 			    (sip->owner->_state == AST_STATE_UP) &&
- 			    !sip->redirip.sin_addr.s_addr &&
- 			    sip->t38.state != T38_ENABLED) {
-+				t = time(NULL);
- 				if (sip->lastrtptx &&
- 				    ast_rtp_get_rtpkeepalive(sip->rtp) &&
- 				    (t > sip->lastrtptx + ast_rtp_get_rtpkeepalive(sip->rtp))) {
- 					/* Need to send an empty RTP packet */
- 					sip->lastrtptx = time(NULL);
- 					ast_rtp_sendcng(sip->rtp, 0);
-+					t = time(NULL);
- 				}
- 				if (sip->lastrtprx &&
- 					(ast_rtp_get_rtptimeout(sip->rtp) || ast_rtp_get_rtpholdtimeout(sip->rtp)) &&
diff --git a/net/asterisk14/files/patch-suppress_log_dups.diff b/net/asterisk14/files/patch-suppress_log_dups.diff
deleted file mode 100644
index 603c6d4540c5..000000000000
--- a/net/asterisk14/files/patch-suppress_log_dups.diff
+++ /dev/null
@@ -1,270 +0,0 @@
-Index: main/logger.c
-===================================================================
---- main/logger.c	(revision 188505)
-+++ main/logger.c	(working copy)
-@@ -140,6 +140,17 @@
- AST_THREADSTORAGE(log_buf, log_buf_init);
- #define LOG_BUF_INIT_SIZE       128
- 
-+/*
-+ * Storage for previous log message to prevent log storms
-+ */
-+static int stored_log_level;
-+static int stored_log_dup_count = 0;
-+static char *stored_log_msg = NULL;
-+static const char *stored_log_file;
-+static int stored_log_line;
-+static const char *stored_log_function;
-+static ast_mutex_t stored_log_msg_lock;
-+
- static int make_components(char *s, int lineno)
- {
- 	char *w;
-@@ -591,6 +602,8 @@
- 	char tmp[256];
- 	int res = 0;
- 
-+        ast_mutex_init(&stored_log_msg_lock);
-+
- 	/* auto rotate if sig SIGXFSZ comes a-knockin */
- 	(void) signal(SIGXFSZ,(void *) handle_SIGXFSZ);
- 
-@@ -655,14 +668,14 @@
- 	return;
- }
- 
--static void __attribute__((format(printf, 5, 0))) ast_log_vsyslog(int level, const char *file, int line, const char *function, const char *fmt, va_list args) 
-+static void ast_log_syslog(int level, const char *file, int line, const char *function, const char *msg) 
- {
- 	char buf[BUFSIZ];
- 	char *s;
- 
- 	if (level >= SYSLOG_NLEVELS) {
- 		/* we are locked here, so cannot ast_log() */
--		fprintf(stderr, "ast_log_vsyslog called with bogus level: %d\n", level);
-+		fprintf(stderr, "ast_log_syslog called with bogus level: %d\n", level);
- 		return;
- 	}
- 	if (level == __LOG_VERBOSE) {
-@@ -676,27 +689,20 @@
- 			 levels[level], (long)GETTID(), file, line, function);
- 	}
- 	s = buf + strlen(buf);
--	vsnprintf(s, sizeof(buf) - strlen(buf), fmt, args);
-+	snprintf(s, sizeof(buf) - strlen(buf), "%s", msg);
- 	term_strip(s, s, strlen(s) + 1);
- 	syslog(syslog_level_map[level], "%s", buf);
- }
- 
--/*!
-- * \brief send log messages to syslog and/or the console
-- */
--void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
-+static void __ast_log(int level, const char *file, int line, const char *function, char *msg, int msglen)
- {
- 	struct logchannel *chan;
--	struct ast_dynamic_str *buf;
- 	time_t t;
- 	struct tm tm;
- 	char date[256];
-+        char buf[2048];
-+        int res;
- 
--	va_list ap;
--
--	if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE)))
--		return;
--
- 	if (AST_LIST_EMPTY(&logchannels))
- 	{
- 		/*
-@@ -704,35 +710,12 @@
- 		 * so just log to stdout
- 		*/
- 		if (level != __LOG_VERBOSE) {
--			int res;
--			va_start(ap, fmt);
--			res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
--			va_end(ap);
--			if (res != AST_DYNSTR_BUILD_FAILED) {
--				term_filter_escapes(buf->str);
--				fputs(buf->str, stdout);
--			}
-+                        term_filter_escapes(msg);
-+                        fputs(msg, stdout);
- 		}
- 		return;
- 	}
- 
--	/* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug
--	   are non-zero; LOG_DEBUG messages can still be displayed if option_debug
--	   is zero, if option_verbose is non-zero (this allows for 'level zero'
--	   LOG_DEBUG messages to be displayed, if the logmask on any channel
--	   allows it)
--	*/
--	if (!option_verbose && !option_debug && (level == __LOG_DEBUG))
--		return;
--
--	/* Ignore anything that never gets logged anywhere */
--	if (!(global_logmask & (1 << level)))
--		return;
--	
--	/* Ignore anything other than the currently debugged file if there is one */
--	if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file))
--		return;
--
- 	time(&t);
- 	ast_localtime(&t, &tm, NULL);
- 	strftime(date, sizeof(date), dateformat, &tm);
-@@ -740,13 +723,8 @@
- 	AST_LIST_LOCK(&logchannels);
- 
- 	if (logfiles.event_log && level == __LOG_EVENT) {
--		va_start(ap, fmt);
--
--		fprintf(eventlog, "%s asterisk[%ld]: ", date, (long)getpid());
--		vfprintf(eventlog, fmt, ap);
-+		fprintf(eventlog, "%s asterisk[%ld]: %s", date, (long)getpid(), msg);
- 		fflush(eventlog);
--
--		va_end(ap);
- 		AST_LIST_UNLOCK(&logchannels);
- 		return;
- 	}
-@@ -756,18 +734,15 @@
- 			break;
- 		/* Check syslog channels */
- 		if (chan->type == LOGTYPE_SYSLOG && (chan->logmask & (1 << level))) {
--			va_start(ap, fmt);
--			ast_log_vsyslog(level, file, line, function, fmt, ap);
--			va_end(ap);
-+			ast_log_syslog(level, file, line, function, msg);
- 		/* Console channels */
- 		} else if ((chan->logmask & (1 << level)) && (chan->type == LOGTYPE_CONSOLE)) {
- 			char linestr[128];
- 			char tmp1[80], tmp2[80], tmp3[80], tmp4[80];
- 
- 			if (level != __LOG_VERBOSE) {
--				int res;
- 				sprintf(linestr, "%d", line);
--				ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf,
-+				snprintf(buf, sizeof(buf),
- 					"[%s] %s[%ld]: %s:%s %s: ",
- 					date,
- 					term_color(tmp1, levels[level], colors[level], 0, sizeof(tmp1)),
-@@ -776,23 +751,17 @@
- 					term_color(tmp3, linestr, COLOR_BRWHITE, 0, sizeof(tmp3)),
- 					term_color(tmp4, function, COLOR_BRWHITE, 0, sizeof(tmp4)));
- 				/*filter to the console!*/
--				term_filter_escapes(buf->str);
--				ast_console_puts_mutable(buf->str);
--				
--				va_start(ap, fmt);
--				res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
--				va_end(ap);
--				if (res != AST_DYNSTR_BUILD_FAILED)
--					ast_console_puts_mutable(buf->str);
-+				term_filter_escapes(buf);
-+				ast_console_puts_mutable(buf);
-+				ast_console_puts_mutable(msg);
- 			}
- 		/* File channels */
- 		} else if ((chan->logmask & (1 << level)) && (chan->fileptr)) {
--			int res;
--			ast_dynamic_str_thread_set(&buf, BUFSIZ, &log_buf, 
-+			snprintf(buf, sizeof(buf), 
- 				"[%s] %s[%ld] %s: ",
- 				date, levels[level], (long)GETTID(), file);
--			res = fprintf(chan->fileptr, "%s", term_strip(buf->str, buf->str, strlen(buf->str) + 1));
--			if (res <= 0 && !ast_strlen_zero(buf->str)) {	/* Error, no characters printed */
-+			res = fprintf(chan->fileptr, "%s", term_strip(buf, buf, strlen(buf) + 1));
-+			if (res <= 0 && !ast_strlen_zero(buf)) {	/* Error, no characters printed */
- 				fprintf(stderr,"**** Asterisk Logging Error: ***********\n");
- 				if (errno == ENOMEM || errno == ENOSPC) {
- 					fprintf(stderr, "Asterisk logging error: Out of disk space, can't log to log file %s\n", chan->filename);
-@@ -801,16 +770,10 @@
- 				manager_event(EVENT_FLAG_SYSTEM, "LogChannel", "Channel: %s\r\nEnabled: No\r\nReason: %d - %s\r\n", chan->filename, errno, strerror(errno));
- 				chan->disabled = 1;	
- 			} else {
--				int res;
- 				/* No error message, continue printing */
--				va_start(ap, fmt);
--				res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
--				va_end(ap);
--				if (res != AST_DYNSTR_BUILD_FAILED) {
--					term_strip(buf->str, buf->str, buf->len);
--					fputs(buf->str, chan->fileptr);
--					fflush(chan->fileptr);
--				}
-+                                term_strip(msg, msg, msglen);
-+                                fputs(msg, chan->fileptr);
-+                                fflush(chan->fileptr);
- 			}
- 		}
- 	}
-@@ -825,6 +788,65 @@
- 	}
- }
- 
-+/*!
-+ * \brief send log messages to syslog and/or the console
-+ */
-+void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
-+{
-+	struct ast_dynamic_str *buf;
-+        int res;
-+	va_list ap;
-+
-+	if (!(buf = ast_dynamic_str_thread_get(&log_buf, LOG_BUF_INIT_SIZE)))
-+		return;
-+
-+        va_start(ap, fmt);
-+        res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
-+        va_end(ap);
-+        if (res == AST_DYNSTR_BUILD_FAILED)
-+                return;
-+
-+	/* don't display LOG_DEBUG messages unless option_verbose _or_ option_debug
-+	   are non-zero; LOG_DEBUG messages can still be displayed if option_debug
-+	   is zero, if option_verbose is non-zero (this allows for 'level zero'
-+	   LOG_DEBUG messages to be displayed, if the logmask on any channel
-+	   allows it)
-+	*/
-+	if (!option_verbose && !option_debug && (level == __LOG_DEBUG))
-+		return;
-+
-+	/* Ignore anything that never gets logged anywhere */
-+	if (!(global_logmask & (1 << level)))
-+		return;
-+	
-+	/* Ignore anything other than the currently debugged file if there is one */
-+	if ((level == __LOG_DEBUG) && !ast_strlen_zero(debug_filename) && strcasecmp(debug_filename, file))
-+		return;
-+
-+        ast_mutex_lock(&stored_log_msg_lock);
-+        if (stored_log_msg == NULL || stored_log_level != level || strcmp(buf->str, stored_log_msg) != 0) {
-+                if (stored_log_dup_count > 0) {
-+                        char buf2[1024];
-+
-+                        snprintf(buf2, sizeof(buf2), "Last message repeated %d times\n", stored_log_dup_count);
-+                        __ast_log(stored_log_level, stored_log_file, stored_log_line, stored_log_function, buf2, strlen(buf2));
-+                }
-+                if (stored_log_msg != NULL)
-+                        ast_free(stored_log_msg);
-+                stored_log_msg = ast_strdup(buf->str);
-+                stored_log_level = level;
-+                stored_log_dup_count = 0;
-+                stored_log_file = file;
-+                stored_log_line = line;
-+                stored_log_function = function;
-+                __ast_log(level, file, line, function, buf->str, buf->len);
-+        }
-+        else
-+                ++stored_log_dup_count;
-+
-+        ast_mutex_unlock(&stored_log_msg_lock);
-+}
-+
- void ast_backtrace(void)
- {
- #ifdef linux
diff --git a/net/asterisk14/files/rtp_force_dtmf-codecnego.diff b/net/asterisk14/files/rtp_force_dtmf-codecnego.diff
deleted file mode 100644
index a670364ba603..000000000000
--- a/net/asterisk14/files/rtp_force_dtmf-codecnego.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- channels/chan_sip.c.orig	2009-11-20 17:56:30.000000000 +0200
-+++ channels/chan_sip.c	2009-11-20 17:59:43.000000000 +0200
-@@ -565,6 +565,9 @@
- static unsigned int global_tos_sip;		/*!< IP type of service for SIP packets */
- static unsigned int global_tos_audio;		/*!< IP type of service for audio RTP packets */
- static unsigned int global_tos_video;		/*!< IP type of service for video RTP packets */
-+static int global_force_dtmf_relay = 0;
-+static int global_force_dtmf_relay_pt = 101;
-+
- static int compactheaders;		/*!< send compact sip headers */
- static int recordhistory;		/*!< Record SIP history. Off by default */
- static int dumphistory;			/*!< Dump history to verbose before destroying SIP dialog */
-@@ -5329,6 +5332,7 @@
-         int x;
-         int codec_index = 0;
-         int codec_pt_order[256];
-+        int dtmf_present = 0;
- 
- 	/* Host information */
- 	struct ast_hostent audiohp;
-@@ -5600,12 +5604,21 @@
-         for (x = 0; x < codec_index; ++x) {
-                 struct rtpPayloadType pt;
-                 pt = ast_rtp_lookup_pt(p->rtp, codec_pt_order[x]);
-+                if (pt.code == AST_RTP_DTMF)
-+                        dtmf_present = 1;
-                 if (!pt.isAstFormat && !pt.code && p->vrtp)
-                         pt = ast_rtp_lookup_pt(p->vrtp, codec_pt_order[x]);
-                 if (pt.isAstFormat)
-                         ast_codec_pref_append(&p->formats, pt.code);
-         }
-         ast_codec_pref_remove2(&p->formats, ~p->usercapability);
-+        if (!dtmf_present && global_force_dtmf_relay) {
-+                newnoncodeccapability |= AST_RTP_DTMF;
-+                ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt);
-+                codec_pt_order[codec_index++] = global_force_dtmf_relay_pt;
-+                ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0);
-+        }
-+
- 	
- 	/* Now gather all of the codecs that we are asked for: */
- 	ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability);
-@@ -18369,6 +18382,9 @@
- 
- 	global_matchexterniplocally = FALSE;
- 
-+	global_force_dtmf_relay = 0;
-+	global_force_dtmf_relay_pt = 101;
-+
- 	/* Copy the default jb config over global_jbconf */
- 	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
- 
-@@ -18431,6 +18447,18 @@
- 			}
- 		} else if (!strcasecmp(v->name, "vmexten")) {
- 			ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten));
-+		} else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) {
-+			if ((global_force_dtmf_relay = ast_true(v->value)))
-+				ast_verbose("RTP DTMF relaying will be enforced\n");
-+			else
-+				ast_verbose("RTP DTMF relaying will not be enforced\n");
-+		} else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) {
-+			sscanf(v->value, "%d", &global_force_dtmf_relay_pt);
-+			if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) {
-+				ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt);
-+				global_force_dtmf_relay_pt = 101;
-+			} else
-+				ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt);
- 		} else if (!strcasecmp(v->name, "rtptimeout")) {
- 			if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) {
- 				ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d.  Using default.\n", v->value, v->lineno);
---- configs/sip.conf.sample.orig	2008-04-25 08:53:52.000000000 -0700
-+++ configs/sip.conf.sample	2008-06-10 00:45:37.000000000 -0700
-@@ -53,6 +53,12 @@
- 				; and multiline formatted headers for strict
- 				; SIP compatibility (defaults to "no")
- 
-+;rtp_force_dtmf_relay=no	; Enable RFC2833 DTMFs to be sent even if peer
-+				; hasn't announced support for it. Default: no
-+
-+;rtp_force_dtmf_relay_pt=101	; RTP payload type value for enforced RFC2833
-+				; DTMFs. Default: 101
-+
- ; See doc/ip-tos.txt for a description of these parameters.
- ;tos_sip=cs3                    ; Sets TOS for SIP packets.
- ;tos_audio=ef                   ; Sets TOS for RTP audio packets.
diff --git a/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff b/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff
deleted file mode 100644
index 9dcb7d8b134f..000000000000
--- a/net/asterisk14/files/rtp_force_dtmf-nocodecnego.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- channels/chan_sip.c.orig	2009-11-23 17:28:47.000000000 +0200
-+++ channels/chan_sip.c	2009-11-23 17:29:29.000000000 +0200
-@@ -565,6 +565,9 @@
- static unsigned int global_tos_sip;		/*!< IP type of service for SIP packets */
- static unsigned int global_tos_audio;		/*!< IP type of service for audio RTP packets */
- static unsigned int global_tos_video;		/*!< IP type of service for video RTP packets */
-+static int global_force_dtmf_relay = 0;
-+static int global_force_dtmf_relay_pt = 101;
-+
- static int compactheaders;		/*!< send compact sip headers */
- static int recordhistory;		/*!< Record SIP history. Off by default */
- static int dumphistory;			/*!< Dump history to verbose before destroying SIP dialog */
-@@ -5593,6 +5596,12 @@
- 	
- 	/* Now gather all of the codecs that we are asked for: */
- 	ast_rtp_get_current_formats(newaudiortp, &peercapability, &peernoncodeccapability);
-+	/* Add telephone-event */
-+	if (global_force_dtmf_relay && !(peernoncodeccapability & AST_RTP_DTMF)) {
-+		ast_rtp_set_m_type(newaudiortp, global_force_dtmf_relay_pt);
-+		ast_rtp_set_rtpmap_type(newaudiortp, global_force_dtmf_relay_pt, "audio", "telephone-event", 0);
-+		peernoncodeccapability |= AST_RTP_DTMF;
-+	}
- 	ast_rtp_get_current_formats(newvideortp, &vpeercapability, &vpeernoncodeccapability);
- 
- 	newjointcapability = p->capability & (peercapability | vpeercapability);
-@@ -18366,6 +18375,9 @@
- 
- 	global_matchexterniplocally = FALSE;
- 
-+	global_force_dtmf_relay = 0;
-+	global_force_dtmf_relay_pt = 101;
-+
- 	/* Copy the default jb config over global_jbconf */
- 	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
- 
-@@ -18428,6 +18440,18 @@
- 			}
- 		} else if (!strcasecmp(v->name, "vmexten")) {
- 			ast_copy_string(default_vmexten, v->value, sizeof(default_vmexten));
-+		} else if (!strcasecmp(v->name, "rtp_force_dtmf_relay")) {
-+			if ((global_force_dtmf_relay = ast_true(v->value)))
-+				ast_verbose("RTP DTMF relaying will be enforced\n");
-+			else
-+				ast_verbose("RTP DTMF relaying will not be enforced\n");
-+		} else if (!strcasecmp(v->name, "rtp_force_dtmf_relay_pt")) {
-+			sscanf(v->value, "%d", &global_force_dtmf_relay_pt);
-+			if (global_force_dtmf_relay_pt < 96 || global_force_dtmf_relay_pt > 255) {
-+				ast_verbose("RTP forced DTMF relay payload type is not valid: %d. Using default (101)\n", global_force_dtmf_relay_pt);
-+				global_force_dtmf_relay_pt = 101;
-+			} else
-+				ast_log(LOG_WARNING, "RTP forced DTMF relay payload type is %d\n", global_force_dtmf_relay_pt);
- 		} else if (!strcasecmp(v->name, "rtptimeout")) {
- 			if ((sscanf(v->value, "%30d", &global_rtptimeout) != 1) || (global_rtptimeout < 0)) {
- 				ast_log(LOG_WARNING, "'%s' is not a valid RTP hold time at line %d.  Using default.\n", v->value, v->lineno);
---- configs/sip.conf.sample.orig	2008-08-16 01:33:42.000000000 +0300
-+++ configs/sip.conf.sample	2008-12-12 17:03:11.000000000 +0200
-@@ -49,6 +49,12 @@
-                                 ; and multiline formatted headers for strict
-                                 ; SIP compatibility (defaults to "no")
- 
-+;rtp_force_dtmf_relay=no	; Enable RFC2833 DTMFs to be sent even if peer 
-+				; hasn't announced support for it. Default: no
-+
-+;rtp_force_dtmf_relay_pt=101	; RTP payload type value for enforced RFC2833
-+				; DTMFs. Default: 101
-+
- ; See doc/ip-tos.txt for a description of these parameters.
- ;tos_sip=cs3                    ; Sets TOS for SIP packets.
- ;tos_audio=ef                   ; Sets TOS for RTP audio packets.
diff --git a/net/asterisk14/files/sip_force_callid.diff b/net/asterisk14/files/sip_force_callid.diff
deleted file mode 100644
index 09cf274581d1..000000000000
--- a/net/asterisk14/files/sip_force_callid.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/chan_sip.c.orig	2009-05-12 21:18:44.000000000 +0300
-+++ channels/chan_sip.c	2009-05-26 12:58:10.000000000 +0300
-@@ -3061,6 +3061,8 @@
- 		} else if (!strcasecmp(ast_var_name(current), "SIPTRANSFER_REPLACES")) {
- 			/* We're replacing a call. */
- 			p->options->replaces = ast_var_value(current);
-+                } else if (!strcasecmp(ast_var_name(current), "SIP_FORCE_CALLID")) {
-+                        ast_string_field_set(p, callid, ast_var_value(current));
- 		}
- 	}
- 	
diff --git a/net/asterisk14/files/sip_set_auth.diff b/net/asterisk14/files/sip_set_auth.diff
deleted file mode 100644
index 1addc4f48add..000000000000
--- a/net/asterisk14/files/sip_set_auth.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- channels/chan_sip.c.orig	2008-04-29 08:21:05.000000000 -0400
-+++ channels/chan_sip.c	2008-05-28 18:41:48.000000000 -0400
-@@ -15962,6 +15978,9 @@
- 	char *ext, *host;
- 	char tmp[256];
- 	char *dest = data;
-+	char *secret = NULL;
-+	char *md5secret = NULL;
-+	char *authname = NULL;
- 
- 	if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) {
- 		ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory or socket error)\n", (char *)data);
-@@ -15983,6 +16002,17 @@
- 	if (host) {
- 		*host++ = '\0';
- 		ext = tmp;
-+		secret = strchr(ext, ':');
-+		if (secret) {
-+			*secret++ = '\0';
-+			md5secret = strchr(secret, ':');
-+			if (md5secret) {
-+				*md5secret++ = '\0';
-+				authname = strchr(md5secret, ':');
-+				if (authname)
-+					*authname++ = '\0';
-+			}
-+		}
- 	} else {
- 		ext = strchr(tmp, '/');
- 		if (ext) 
-@@ -16015,6 +16045,14 @@
- 		ast_string_field_set(p, username, ext);
- 		ast_string_field_free(p, fullcontact);
- 	}
-+	if (secret && !ast_strlen_zero(secret))
-+		ast_string_field_set(p, peersecret, secret);
-+
-+	if (md5secret && !ast_strlen_zero(md5secret))
-+		ast_string_field_set(p, peermd5secret, md5secret);
-+
-+	if (authname && !ast_strlen_zero(authname))
-+		ast_string_field_set(p, authname, authname);
- #if 0
- 	printf("Setting up to call extension '%s' at '%s'\n", ext ? ext : "<none>", host);
- #endif
diff --git a/net/asterisk14/pkg-descr b/net/asterisk14/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk14/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
deleted file mode 100644
index 67fdd2a2e584..000000000000
--- a/net/asterisk14/pkg-plist
+++ /dev/null
@@ -1,971 +0,0 @@
-@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi
-etc/asterisk/adsi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi
-etc/asterisk/adtranvofr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi
-etc/asterisk/agents.conf-dist
-@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi
-etc/asterisk/alarmreceiver.conf-dist
-@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
-etc/asterisk/alsa.conf-dist
-@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi
-etc/asterisk/amd.conf-dist
-@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
-etc/asterisk/asterisk.adsi-dist
-@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
-etc/asterisk/asterisk.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi
-etc/asterisk/cdr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi
-etc/asterisk/cdr_custom.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi
-etc/asterisk/cdr_manager.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi
-etc/asterisk/cdr_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi
-etc/asterisk/cdr_pgsql.conf-dist
-@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
-etc/asterisk/cdr_tds.conf-dist
-@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi
-etc/asterisk/chan_dahdi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi
-etc/asterisk/codecs.conf-dist
-@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi
-etc/asterisk/dnsmgr.conf-dist
-@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi
-etc/asterisk/dundi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi
-etc/asterisk/enum.conf-dist
-@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi
-etc/asterisk/extconfig.conf-dist
-@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi
-etc/asterisk/extensions.ael-dist
-@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi
-etc/asterisk/extensions.conf-dist
-@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi
-etc/asterisk/features.conf-dist
-@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
-etc/asterisk/festival.conf-dist
-@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi
-etc/asterisk/followme.conf-dist
-@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi
-etc/asterisk/func_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi
-etc/asterisk/gtalk.conf-dist
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi
-etc/asterisk/http.conf-dist
-@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
-etc/asterisk/iax.conf-dist
-@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
-etc/asterisk/iaxprov.conf-dist
-@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
-etc/asterisk/indications.conf-dist
-@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi
-etc/asterisk/jabber.conf-dist
-@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
-etc/asterisk/logger.conf-dist
-@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
-etc/asterisk/manager.conf-dist
-@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi
-etc/asterisk/meetme.conf-dist
-@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi
-etc/asterisk/mgcp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi
-etc/asterisk/misdn.conf-dist
-@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi
-etc/asterisk/modules.conf-dist
-@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
-etc/asterisk/musiconhold.conf-dist
-@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi
-etc/asterisk/muted.conf-dist
-@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
-etc/asterisk/osp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
-etc/asterisk/oss.conf-dist
-@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi
-etc/asterisk/phone.conf-dist
-@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi
-etc/asterisk/privacy.conf-dist
-@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
-etc/asterisk/queues.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
-etc/asterisk/res_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi
-etc/asterisk/res_pgsql.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi
-etc/asterisk/res_snmp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
-etc/asterisk/rpt.conf-dist
-@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
-etc/asterisk/rtp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi
-etc/asterisk/say.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
-etc/asterisk/sip.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi
-etc/asterisk/sip_notify.conf-dist
-@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
-etc/asterisk/skinny.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi
-etc/asterisk/sla.conf-dist
-@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi
-etc/asterisk/smdi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
-etc/asterisk/telcordia-1.adsi-dist
-@unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi
-etc/asterisk/udptl.conf-dist
-@unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi
-etc/asterisk/users.conf-dist
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi
-@exec if test ! -e %D/etc/asterisk/adtranvofr.conf; then cp -p %D/etc/asterisk/adtranvofr.conf-dist %D/etc/asterisk/adtranvofr.conf; fi
-@exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi
-@exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi
-@exec if test ! -e %D/etc/asterisk/alsa.conf; then cp -p %D/etc/asterisk/alsa.conf-dist %D/etc/asterisk/alsa.conf; fi
-@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi
-@exec if test ! -e %D/etc/asterisk/asterisk.adsi; then cp -p %D/etc/asterisk/asterisk.adsi-dist %D/etc/asterisk/asterisk.adsi; fi
-@exec if test ! -e %D/etc/asterisk/asterisk.conf; then cp -p %D/etc/asterisk/asterisk.conf-dist %D/etc/asterisk/asterisk.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr.conf; then cp -p %D/etc/asterisk/cdr.conf-dist %D/etc/asterisk/cdr.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr_custom.conf; then cp -p %D/etc/asterisk/cdr_custom.conf-dist %D/etc/asterisk/cdr_custom.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr_manager.conf; then cp -p %D/etc/asterisk/cdr_manager.conf-dist %D/etc/asterisk/cdr_manager.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr_odbc.conf; then cp -p %D/etc/asterisk/cdr_odbc.conf-dist %D/etc/asterisk/cdr_odbc.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr_pgsql.conf; then cp -p %D/etc/asterisk/cdr_pgsql.conf-dist %D/etc/asterisk/cdr_pgsql.conf; fi
-@exec if test ! -e %D/etc/asterisk/cdr_tds.conf; then cp -p %D/etc/asterisk/cdr_tds.conf-dist %D/etc/asterisk/cdr_tds.conf; fi
-@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi
-@exec if test ! -e %D/etc/asterisk/codecs.conf; then cp -p %D/etc/asterisk/codecs.conf-dist %D/etc/asterisk/codecs.conf; fi
-@exec if test ! -e %D/etc/asterisk/dnsmgr.conf; then cp -p %D/etc/asterisk/dnsmgr.conf-dist %D/etc/asterisk/dnsmgr.conf; fi
-@exec if test ! -e %D/etc/asterisk/dundi.conf; then cp -p %D/etc/asterisk/dundi.conf-dist %D/etc/asterisk/dundi.conf; fi
-@exec if test ! -e %D/etc/asterisk/enum.conf; then cp -p %D/etc/asterisk/enum.conf-dist %D/etc/asterisk/enum.conf; fi
-@exec if test ! -e %D/etc/asterisk/extconfig.conf; then cp -p %D/etc/asterisk/extconfig.conf-dist %D/etc/asterisk/extconfig.conf; fi
-@exec if test ! -e %D/etc/asterisk/extensions.ael; then cp -p %D/etc/asterisk/extensions.ael-dist %D/etc/asterisk/extensions.ael; fi
-@exec if test ! -e %D/etc/asterisk/extensions.conf; then cp -p %D/etc/asterisk/extensions.conf-dist %D/etc/asterisk/extensions.conf; fi
-@exec if test ! -e %D/etc/asterisk/features.conf; then cp -p %D/etc/asterisk/features.conf-dist %D/etc/asterisk/features.conf; fi
-@exec if test ! -e %D/etc/asterisk/festival.conf; then cp -p %D/etc/asterisk/festival.conf-dist %D/etc/asterisk/festival.conf; fi
-@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi
-@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi
-@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi
-@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi
-@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi
-@exec if test ! -e %D/etc/asterisk/iax.conf; then cp -p %D/etc/asterisk/iax.conf-dist %D/etc/asterisk/iax.conf; fi
-@exec if test ! -e %D/etc/asterisk/iaxprov.conf; then cp -p %D/etc/asterisk/iaxprov.conf-dist %D/etc/asterisk/iaxprov.conf; fi
-@exec if test ! -e %D/etc/asterisk/indications.conf; then cp -p %D/etc/asterisk/indications.conf-dist %D/etc/asterisk/indications.conf; fi
-@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi
-@exec if test ! -e %D/etc/asterisk/logger.conf; then cp -p %D/etc/asterisk/logger.conf-dist %D/etc/asterisk/logger.conf; fi
-@exec if test ! -e %D/etc/asterisk/manager.conf; then cp -p %D/etc/asterisk/manager.conf-dist %D/etc/asterisk/manager.conf; fi
-@exec if test ! -e %D/etc/asterisk/meetme.conf; then cp -p %D/etc/asterisk/meetme.conf-dist %D/etc/asterisk/meetme.conf; fi
-@exec if test ! -e %D/etc/asterisk/mgcp.conf; then cp -p %D/etc/asterisk/mgcp.conf-dist %D/etc/asterisk/mgcp.conf; fi
-@exec if test ! -e %D/etc/asterisk/misdn.conf; then cp -p %D/etc/asterisk/misdn.conf-dist %D/etc/asterisk/misdn.conf; fi
-@exec if test ! -e %D/etc/asterisk/modules.conf; then cp -p %D/etc/asterisk/modules.conf-dist %D/etc/asterisk/modules.conf; fi
-@exec if test ! -e %D/etc/asterisk/musiconhold.conf; then cp -p %D/etc/asterisk/musiconhold.conf-dist %D/etc/asterisk/musiconhold.conf; fi
-@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi
-@exec if test ! -e %D/etc/asterisk/osp.conf; then cp -p %D/etc/asterisk/osp.conf-dist %D/etc/asterisk/osp.conf; fi
-@exec if test ! -e %D/etc/asterisk/oss.conf; then cp -p %D/etc/asterisk/oss.conf-dist %D/etc/asterisk/oss.conf; fi
-@exec if test ! -e %D/etc/asterisk/phone.conf; then cp -p %D/etc/asterisk/phone.conf-dist %D/etc/asterisk/phone.conf; fi
-@exec if test ! -e %D/etc/asterisk/privacy.conf; then cp -p %D/etc/asterisk/privacy.conf-dist %D/etc/asterisk/privacy.conf; fi
-@exec if test ! -e %D/etc/asterisk/queues.conf; then cp -p %D/etc/asterisk/queues.conf-dist %D/etc/asterisk/queues.conf; fi
-@exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi
-@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi
-@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi
-@exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi
-@exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi
-@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi
-@exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi
-@exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi
-@exec if test ! -e %D/etc/asterisk/skinny.conf; then cp -p %D/etc/asterisk/skinny.conf-dist %D/etc/asterisk/skinny.conf; fi
-@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi
-@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi
-@exec if test ! -e %D/etc/asterisk/telcordia-1.adsi; then cp -p %D/etc/asterisk/telcordia-1.adsi-dist %D/etc/asterisk/telcordia-1.adsi; fi
-@exec if test ! -e %D/etc/asterisk/udptl.conf; then cp -p %D/etc/asterisk/udptl.conf-dist %D/etc/asterisk/udptl.conf; fi
-@exec if test ! -e %D/etc/asterisk/users.conf; then cp -p %D/etc/asterisk/users.conf-dist %D/etc/asterisk/users.conf; fi
-@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi
-@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi
-include/asterisk.h
-include/asterisk/abstract_jb.h
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/ael_structs.h
-include/asterisk/aes.h
-include/asterisk/agi.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/astobj.h
-include/asterisk/astobj2.h
-include/asterisk/astosp.h
-include/asterisk/audiohook.h
-include/asterisk/autoconfig.h
-include/asterisk/build.h
-include/asterisk/buildopts.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/compat.h
-include/asterisk/compiler.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/dahdi_compat.h
-include/asterisk/devicestate.h
-include/asterisk/dial.h
-include/asterisk/dns.h
-include/asterisk/dnsmgr.h
-include/asterisk/doxyref.h
-include/asterisk/dsp.h
-include/asterisk/dundi.h
-include/asterisk/endian.h
-include/asterisk/enum.h
-include/asterisk/features.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/global_datastores.h
-include/asterisk/http.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/inline_api.h
-include/asterisk/io.h
-include/asterisk/jabber.h
-include/asterisk/jingle.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/netsock.h
-include/asterisk/options.h
-include/asterisk/paths.h
-include/asterisk/pbx.h
-include/asterisk/plc.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/res_odbc.h
-include/asterisk/rtp.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/select.h
-include/asterisk/sha1.h
-include/asterisk/slinfactory.h
-include/asterisk/smdi.h
-include/asterisk/speech.h
-include/asterisk/srv.h
-include/asterisk/stringfields.h
-include/asterisk/strings.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/test.h
-include/asterisk/threadstorage.h
-include/asterisk/time.h
-include/asterisk/tonezone_compat.h
-include/asterisk/transcap.h
-include/asterisk/translate.h
-include/asterisk/udptl.h
-include/asterisk/ulaw.h
-include/asterisk/unaligned.h
-include/asterisk/utils.h
-include/asterisk/version.h
-lib/asterisk/modules/app_adsiprog.so
-lib/asterisk/modules/app_alarmreceiver.so
-lib/asterisk/modules/app_amd.so
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_channelredirect.so
-lib/asterisk/modules/app_chanspy.so
-lib/asterisk/modules/app_controlplayback.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiscan.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_dictate.so
-lib/asterisk/modules/app_directed_pickup.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_dumpchan.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_exec.so
-lib/asterisk/modules/app_externalivr.so
-lib/asterisk/modules/app_festival.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_flash.so
-lib/asterisk/modules/app_followme.so
-lib/asterisk/modules/app_forkcdr.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_hasnewvoicemail.so
-lib/asterisk/modules/app_ices.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_lookupblacklist.so
-lib/asterisk/modules/app_lookupcidname.so
-lib/asterisk/modules/app_macro.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so
-lib/asterisk/modules/app_milliwatt.so
-lib/asterisk/modules/app_mixmonitor.so
-lib/asterisk/modules/app_morsecode.so
-lib/asterisk/modules/app_mp3.so
-lib/asterisk/modules/app_nbscat.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_page.so
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_random.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_readfile.so
-lib/asterisk/modules/app_realtime.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_sendtext.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_setcdruserfield.so
-lib/asterisk/modules/app_settransfercapability.so
-lib/asterisk/modules/app_sms.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_speech_utils.so
-lib/asterisk/modules/app_stack.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_talkdetect.so
-lib/asterisk/modules/app_test.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_userevent.so
-lib/asterisk/modules/app_verbose.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_waitforsilence.so
-lib/asterisk/modules/app_while.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/cdr_custom.so
-lib/asterisk/modules/cdr_manager.so
-%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
-%%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
-%%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
-%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so
-%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so
-lib/asterisk/modules/chan_agent.so
-%%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so
-%%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so
-%%WITH_H323%%lib/asterisk/modules/chan_h323.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-lib/asterisk/modules/chan_skinny.so
-lib/asterisk/modules/codec_a_mu.so
-lib/asterisk/modules/codec_adpcm.so
-lib/asterisk/modules/codec_alaw.so
-%%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so
-lib/asterisk/modules/codec_g726.so
-lib/asterisk/modules/codec_gsm.so
-%%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723.so
-lib/asterisk/modules/format_g726.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_h264.so
-lib/asterisk/modules/format_ilbc.so
-lib/asterisk/modules/format_jpeg.so
-%%WITH_OGGVORBIS%%lib/asterisk/modules/format_ogg_vorbis.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_sln.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/func_audiohookinherit.so
-lib/asterisk/modules/func_base64.so
-lib/asterisk/modules/func_callerid.so
-lib/asterisk/modules/func_cdr.so
-lib/asterisk/modules/func_channel.so
-lib/asterisk/modules/func_curl.so
-lib/asterisk/modules/func_cut.so
-lib/asterisk/modules/func_db.so
-lib/asterisk/modules/func_enum.so
-lib/asterisk/modules/func_env.so
-lib/asterisk/modules/func_global.so
-lib/asterisk/modules/func_groupcount.so
-lib/asterisk/modules/func_language.so
-lib/asterisk/modules/func_logic.so
-lib/asterisk/modules/func_math.so
-lib/asterisk/modules/func_md5.so
-lib/asterisk/modules/func_moh.so
-%%WITH_ODBC%%lib/asterisk/modules/func_odbc.so
-lib/asterisk/modules/func_rand.so
-lib/asterisk/modules/func_realtime.so
-lib/asterisk/modules/func_sha1.so
-lib/asterisk/modules/func_strings.so
-lib/asterisk/modules/func_timeout.so
-lib/asterisk/modules/func_uri.so
-lib/asterisk/modules/pbx_ael.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_dundi.so
-lib/asterisk/modules/pbx_loopback.so
-lib/asterisk/modules/pbx_realtime.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_agi.so
-lib/asterisk/modules/res_clioriginate.so
-%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
-%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
-lib/asterisk/modules/res_convert.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_features.so
-lib/asterisk/modules/res_indications.so
-%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
-lib/asterisk/modules/res_smdi.so
-%%WITH_SNMP%%lib/asterisk/modules/res_snmp.so
-lib/asterisk/modules/res_speech.so
-sbin/aelparse
-sbin/asterisk
-sbin/astgenkey
-sbin/astman
-sbin/autosupport
-sbin/muted
-sbin/rasterisk
-sbin/safe_asterisk
-sbin/smsq
-sbin/stereorize
-sbin/streamplayer
-share/asterisk/agi-bin/agi-test.agi
-share/asterisk/agi-bin/eagi-sphinx-test
-share/asterisk/agi-bin/eagi-test
-share/asterisk/agi-bin/jukebox.agi
-share/asterisk/images/asterisk-intro.jpg
-share/asterisk/keys/freeworlddialup.pub
-share/asterisk/keys/iaxtel.pub
-share/asterisk/moh/.asterisk-moh-opsound-wav-2.03
-share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
-share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
-share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
-share/asterisk/moh/macroform-cold_day.wav
-share/asterisk/moh/macroform-robot_dity.wav
-share/asterisk/moh/macroform-the_simplicity.wav
-share/asterisk/moh/manolo_camp-morning_coffee.wav
-share/asterisk/moh/reno_project-system.wav
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19
-share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.19
-share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.19
-share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.19
-share/asterisk/sounds/agent-alreadyon.gsm
-share/asterisk/sounds/agent-incorrect.gsm
-share/asterisk/sounds/agent-loggedoff.gsm
-share/asterisk/sounds/agent-loginok.gsm
-share/asterisk/sounds/agent-newlocation.gsm
-share/asterisk/sounds/agent-pass.gsm
-share/asterisk/sounds/agent-user.gsm
-share/asterisk/sounds/ascending-2tone.gsm
-share/asterisk/sounds/auth-incorrect.gsm
-share/asterisk/sounds/auth-thankyou.gsm
-share/asterisk/sounds/beep.gsm
-share/asterisk/sounds/beeperr.gsm
-share/asterisk/sounds/conf-adminmenu-162.gsm
-share/asterisk/sounds/conf-adminmenu.gsm
-share/asterisk/sounds/conf-enteringno.gsm
-share/asterisk/sounds/conf-errormenu.gsm
-share/asterisk/sounds/conf-extended.gsm
-share/asterisk/sounds/conf-getchannel.gsm
-share/asterisk/sounds/conf-getconfno.gsm
-share/asterisk/sounds/conf-getpin.gsm
-share/asterisk/sounds/conf-hasjoin.gsm
-share/asterisk/sounds/conf-hasleft.gsm
-share/asterisk/sounds/conf-invalid.gsm
-share/asterisk/sounds/conf-invalidpin.gsm
-share/asterisk/sounds/conf-kicked.gsm
-share/asterisk/sounds/conf-leaderhasleft.gsm
-share/asterisk/sounds/conf-locked.gsm
-share/asterisk/sounds/conf-lockednow.gsm
-share/asterisk/sounds/conf-muted.gsm
-share/asterisk/sounds/conf-noempty.gsm
-share/asterisk/sounds/conf-nonextended.gsm
-share/asterisk/sounds/conf-now-muted.gsm
-share/asterisk/sounds/conf-now-recording.gsm
-share/asterisk/sounds/conf-now-unmuted.gsm
-share/asterisk/sounds/conf-onlyone.gsm
-share/asterisk/sounds/conf-onlyperson.gsm
-share/asterisk/sounds/conf-otherinparty.gsm
-share/asterisk/sounds/conf-placeintoconf.gsm
-share/asterisk/sounds/conf-roll-callcomplete.gsm
-share/asterisk/sounds/conf-thereare.gsm
-share/asterisk/sounds/conf-unlockednow.gsm
-share/asterisk/sounds/conf-unmuted.gsm
-share/asterisk/sounds/conf-usermenu-162.gsm
-share/asterisk/sounds/conf-usermenu.gsm
-share/asterisk/sounds/conf-userswilljoin.gsm
-share/asterisk/sounds/conf-userwilljoin.gsm
-share/asterisk/sounds/conf-waitforleader.gsm
-share/asterisk/sounds/core-sounds-en.txt
-share/asterisk/sounds/demo-abouttotry.gsm
-share/asterisk/sounds/demo-congrats.gsm
-share/asterisk/sounds/demo-echodone.gsm
-share/asterisk/sounds/demo-echotest.gsm
-share/asterisk/sounds/demo-enterkeywords.gsm
-share/asterisk/sounds/demo-instruct.gsm
-share/asterisk/sounds/demo-moreinfo.gsm
-share/asterisk/sounds/demo-nogo.gsm
-share/asterisk/sounds/demo-nomatch.gsm
-share/asterisk/sounds/demo-thanks.gsm
-share/asterisk/sounds/descending-2tone.gsm
-share/asterisk/sounds/dictate/both_help.gsm
-share/asterisk/sounds/dictate/enter_filename.gsm
-share/asterisk/sounds/dictate/forhelp.gsm
-share/asterisk/sounds/dictate/pause.gsm
-share/asterisk/sounds/dictate/paused.gsm
-share/asterisk/sounds/dictate/play_help.gsm
-share/asterisk/sounds/dictate/playback.gsm
-share/asterisk/sounds/dictate/playback_mode.gsm
-share/asterisk/sounds/dictate/record.gsm
-share/asterisk/sounds/dictate/record_help.gsm
-share/asterisk/sounds/dictate/record_mode.gsm
-share/asterisk/sounds/dictate/truncating_audio.gsm
-share/asterisk/sounds/digits/0.gsm
-share/asterisk/sounds/digits/1.gsm
-share/asterisk/sounds/digits/10.gsm
-share/asterisk/sounds/digits/11.gsm
-share/asterisk/sounds/digits/12.gsm
-share/asterisk/sounds/digits/13.gsm
-share/asterisk/sounds/digits/14.gsm
-share/asterisk/sounds/digits/15.gsm
-share/asterisk/sounds/digits/16.gsm
-share/asterisk/sounds/digits/17.gsm
-share/asterisk/sounds/digits/18.gsm
-share/asterisk/sounds/digits/19.gsm
-share/asterisk/sounds/digits/2.gsm
-share/asterisk/sounds/digits/20.gsm
-share/asterisk/sounds/digits/3.gsm
-share/asterisk/sounds/digits/30.gsm
-share/asterisk/sounds/digits/4.gsm
-share/asterisk/sounds/digits/40.gsm
-share/asterisk/sounds/digits/5.gsm
-share/asterisk/sounds/digits/50.gsm
-share/asterisk/sounds/digits/6.gsm
-share/asterisk/sounds/digits/60.gsm
-share/asterisk/sounds/digits/7.gsm
-share/asterisk/sounds/digits/70.gsm
-share/asterisk/sounds/digits/8.gsm
-share/asterisk/sounds/digits/80.gsm
-share/asterisk/sounds/digits/9.gsm
-share/asterisk/sounds/digits/90.gsm
-share/asterisk/sounds/digits/a-m.gsm
-share/asterisk/sounds/digits/at.gsm
-share/asterisk/sounds/digits/billion.gsm
-share/asterisk/sounds/digits/day-0.gsm
-share/asterisk/sounds/digits/day-1.gsm
-share/asterisk/sounds/digits/day-2.gsm
-share/asterisk/sounds/digits/day-3.gsm
-share/asterisk/sounds/digits/day-4.gsm
-share/asterisk/sounds/digits/day-5.gsm
-share/asterisk/sounds/digits/day-6.gsm
-share/asterisk/sounds/digits/dollars.gsm
-share/asterisk/sounds/digits/h-1.gsm
-share/asterisk/sounds/digits/h-10.gsm
-share/asterisk/sounds/digits/h-11.gsm
-share/asterisk/sounds/digits/h-12.gsm
-share/asterisk/sounds/digits/h-13.gsm
-share/asterisk/sounds/digits/h-14.gsm
-share/asterisk/sounds/digits/h-15.gsm
-share/asterisk/sounds/digits/h-16.gsm
-share/asterisk/sounds/digits/h-17.gsm
-share/asterisk/sounds/digits/h-18.gsm
-share/asterisk/sounds/digits/h-19.gsm
-share/asterisk/sounds/digits/h-2.gsm
-share/asterisk/sounds/digits/h-20.gsm
-share/asterisk/sounds/digits/h-3.gsm
-share/asterisk/sounds/digits/h-30.gsm
-share/asterisk/sounds/digits/h-4.gsm
-share/asterisk/sounds/digits/h-40.gsm
-share/asterisk/sounds/digits/h-5.gsm
-share/asterisk/sounds/digits/h-50.gsm
-share/asterisk/sounds/digits/h-6.gsm
-share/asterisk/sounds/digits/h-60.gsm
-share/asterisk/sounds/digits/h-7.gsm
-share/asterisk/sounds/digits/h-70.gsm
-share/asterisk/sounds/digits/h-8.gsm
-share/asterisk/sounds/digits/h-80.gsm
-share/asterisk/sounds/digits/h-9.gsm
-share/asterisk/sounds/digits/h-90.gsm
-share/asterisk/sounds/digits/h-billion.gsm
-share/asterisk/sounds/digits/h-hundred.gsm
-share/asterisk/sounds/digits/h-million.gsm
-share/asterisk/sounds/digits/h-thousand.gsm
-share/asterisk/sounds/digits/hundred.gsm
-share/asterisk/sounds/digits/million.gsm
-share/asterisk/sounds/digits/minus.gsm
-share/asterisk/sounds/digits/mon-0.gsm
-share/asterisk/sounds/digits/mon-1.gsm
-share/asterisk/sounds/digits/mon-10.gsm
-share/asterisk/sounds/digits/mon-11.gsm
-share/asterisk/sounds/digits/mon-2.gsm
-share/asterisk/sounds/digits/mon-3.gsm
-share/asterisk/sounds/digits/mon-4.gsm
-share/asterisk/sounds/digits/mon-5.gsm
-share/asterisk/sounds/digits/mon-6.gsm
-share/asterisk/sounds/digits/mon-7.gsm
-share/asterisk/sounds/digits/mon-8.gsm
-share/asterisk/sounds/digits/mon-9.gsm
-share/asterisk/sounds/digits/oclock.gsm
-share/asterisk/sounds/digits/oh.gsm
-share/asterisk/sounds/digits/p-m.gsm
-share/asterisk/sounds/digits/pound.gsm
-share/asterisk/sounds/digits/star.gsm
-share/asterisk/sounds/digits/thousand.gsm
-share/asterisk/sounds/digits/today.gsm
-share/asterisk/sounds/digits/tomorrow.gsm
-share/asterisk/sounds/digits/yesterday.gsm
-share/asterisk/sounds/dir-first.gsm
-share/asterisk/sounds/dir-firstlast.gsm
-share/asterisk/sounds/dir-instr.gsm
-share/asterisk/sounds/dir-intro-fn.gsm
-share/asterisk/sounds/dir-intro.gsm
-share/asterisk/sounds/dir-last.gsm
-share/asterisk/sounds/dir-multi1.gsm
-share/asterisk/sounds/dir-multi2.gsm
-share/asterisk/sounds/dir-multi3.gsm
-share/asterisk/sounds/dir-multi9.gsm
-share/asterisk/sounds/dir-nomatch.gsm
-share/asterisk/sounds/dir-nomore.gsm
-share/asterisk/sounds/dir-pls-enter.gsm
-share/asterisk/sounds/dir-usingkeypad.gsm
-share/asterisk/sounds/dir-welcome.gsm
-share/asterisk/sounds/followme/call-from.gsm
-share/asterisk/sounds/followme/no-recording.gsm
-share/asterisk/sounds/followme/options.gsm
-share/asterisk/sounds/followme/pls-hold-while-try.gsm
-share/asterisk/sounds/followme/sorry.gsm
-share/asterisk/sounds/followme/status.gsm
-share/asterisk/sounds/hello-world.gsm
-share/asterisk/sounds/hours.gsm
-share/asterisk/sounds/invalid.gsm
-share/asterisk/sounds/letters/a.gsm
-share/asterisk/sounds/letters/ascii123.gsm
-share/asterisk/sounds/letters/ascii124.gsm
-share/asterisk/sounds/letters/ascii125.gsm
-share/asterisk/sounds/letters/ascii126.gsm
-share/asterisk/sounds/letters/ascii34.gsm
-share/asterisk/sounds/letters/ascii36.gsm
-share/asterisk/sounds/letters/ascii37.gsm
-share/asterisk/sounds/letters/ascii38.gsm
-share/asterisk/sounds/letters/ascii39.gsm
-share/asterisk/sounds/letters/ascii40.gsm
-share/asterisk/sounds/letters/ascii41.gsm
-share/asterisk/sounds/letters/ascii42.gsm
-share/asterisk/sounds/letters/ascii44.gsm
-share/asterisk/sounds/letters/ascii58.gsm
-share/asterisk/sounds/letters/ascii59.gsm
-share/asterisk/sounds/letters/ascii60.gsm
-share/asterisk/sounds/letters/ascii62.gsm
-share/asterisk/sounds/letters/ascii63.gsm
-share/asterisk/sounds/letters/ascii91.gsm
-share/asterisk/sounds/letters/ascii92.gsm
-share/asterisk/sounds/letters/ascii93.gsm
-share/asterisk/sounds/letters/ascii94.gsm
-share/asterisk/sounds/letters/ascii95.gsm
-share/asterisk/sounds/letters/ascii96.gsm
-share/asterisk/sounds/letters/asterisk.gsm
-share/asterisk/sounds/letters/at.gsm
-share/asterisk/sounds/letters/b.gsm
-share/asterisk/sounds/letters/c.gsm
-share/asterisk/sounds/letters/d.gsm
-share/asterisk/sounds/letters/dash.gsm
-share/asterisk/sounds/letters/dollar.gsm
-share/asterisk/sounds/letters/dot.gsm
-share/asterisk/sounds/letters/e.gsm
-share/asterisk/sounds/letters/equals.gsm
-share/asterisk/sounds/letters/exclaimation-point.gsm
-share/asterisk/sounds/letters/f.gsm
-share/asterisk/sounds/letters/g.gsm
-share/asterisk/sounds/letters/h.gsm
-share/asterisk/sounds/letters/i.gsm
-share/asterisk/sounds/letters/j.gsm
-share/asterisk/sounds/letters/k.gsm
-share/asterisk/sounds/letters/l.gsm
-share/asterisk/sounds/letters/m.gsm
-share/asterisk/sounds/letters/n.gsm
-share/asterisk/sounds/letters/o.gsm
-share/asterisk/sounds/letters/p.gsm
-share/asterisk/sounds/letters/plus.gsm
-share/asterisk/sounds/letters/q.gsm
-share/asterisk/sounds/letters/r.gsm
-share/asterisk/sounds/letters/s.gsm
-share/asterisk/sounds/letters/slash.gsm
-share/asterisk/sounds/letters/space.gsm
-share/asterisk/sounds/letters/t.gsm
-share/asterisk/sounds/letters/u.gsm
-share/asterisk/sounds/letters/v.gsm
-share/asterisk/sounds/letters/w.gsm
-share/asterisk/sounds/letters/x.gsm
-share/asterisk/sounds/letters/y.gsm
-share/asterisk/sounds/letters/z.gsm
-share/asterisk/sounds/letters/zed.gsm
-share/asterisk/sounds/minutes.gsm
-share/asterisk/sounds/pbx-invalid.gsm
-share/asterisk/sounds/pbx-invalidpark.gsm
-share/asterisk/sounds/pbx-parkingfailed.gsm
-share/asterisk/sounds/pbx-transfer.gsm
-share/asterisk/sounds/phonetic/9_p.gsm
-share/asterisk/sounds/phonetic/a_p.gsm
-share/asterisk/sounds/phonetic/b_p.gsm
-share/asterisk/sounds/phonetic/c_p.gsm
-share/asterisk/sounds/phonetic/d_p.gsm
-share/asterisk/sounds/phonetic/e_p.gsm
-share/asterisk/sounds/phonetic/f_p.gsm
-share/asterisk/sounds/phonetic/g_p.gsm
-share/asterisk/sounds/phonetic/h_p.gsm
-share/asterisk/sounds/phonetic/i_p.gsm
-share/asterisk/sounds/phonetic/j_p.gsm
-share/asterisk/sounds/phonetic/k_p.gsm
-share/asterisk/sounds/phonetic/l_p.gsm
-share/asterisk/sounds/phonetic/m_p.gsm
-share/asterisk/sounds/phonetic/n_p.gsm
-share/asterisk/sounds/phonetic/o_p.gsm
-share/asterisk/sounds/phonetic/p_p.gsm
-share/asterisk/sounds/phonetic/q_p.gsm
-share/asterisk/sounds/phonetic/r_p.gsm
-share/asterisk/sounds/phonetic/s_p.gsm
-share/asterisk/sounds/phonetic/t_p.gsm
-share/asterisk/sounds/phonetic/u_p.gsm
-share/asterisk/sounds/phonetic/v_p.gsm
-share/asterisk/sounds/phonetic/w_p.gsm
-share/asterisk/sounds/phonetic/x_p.gsm
-share/asterisk/sounds/phonetic/y_p.gsm
-share/asterisk/sounds/phonetic/z_p.gsm
-share/asterisk/sounds/priv-callee-options.gsm
-share/asterisk/sounds/priv-callpending.gsm
-share/asterisk/sounds/priv-introsaved.gsm
-share/asterisk/sounds/priv-recordintro.gsm
-share/asterisk/sounds/privacy-incorrect.gsm
-share/asterisk/sounds/privacy-prompt.gsm
-share/asterisk/sounds/privacy-thankyou.gsm
-share/asterisk/sounds/privacy-unident.gsm
-share/asterisk/sounds/queue-callswaiting.gsm
-share/asterisk/sounds/queue-holdtime.gsm
-share/asterisk/sounds/queue-less-than.gsm
-share/asterisk/sounds/queue-minute.gsm
-share/asterisk/sounds/queue-minutes.gsm
-share/asterisk/sounds/queue-periodic-announce.gsm
-share/asterisk/sounds/queue-quantity1.gsm
-share/asterisk/sounds/queue-quantity2.gsm
-share/asterisk/sounds/queue-reporthold.gsm
-share/asterisk/sounds/queue-seconds.gsm
-share/asterisk/sounds/queue-thankyou.gsm
-share/asterisk/sounds/queue-thereare.gsm
-share/asterisk/sounds/queue-youarenext.gsm
-share/asterisk/sounds/screen-callee-options.gsm
-share/asterisk/sounds/seconds.gsm
-share/asterisk/sounds/silence/1.gsm
-share/asterisk/sounds/silence/10.gsm
-share/asterisk/sounds/silence/2.gsm
-share/asterisk/sounds/silence/3.gsm
-share/asterisk/sounds/silence/4.gsm
-share/asterisk/sounds/silence/5.gsm
-share/asterisk/sounds/silence/6.gsm
-share/asterisk/sounds/silence/7.gsm
-share/asterisk/sounds/silence/8.gsm
-share/asterisk/sounds/silence/9.gsm
-share/asterisk/sounds/spy-agent.gsm
-share/asterisk/sounds/spy-console.gsm
-share/asterisk/sounds/spy-dahdi.gsm
-share/asterisk/sounds/spy-h323.gsm
-share/asterisk/sounds/spy-iax.gsm
-share/asterisk/sounds/spy-iax2.gsm
-share/asterisk/sounds/spy-jingle.gsm
-share/asterisk/sounds/spy-local.gsm
-share/asterisk/sounds/spy-mgcp.gsm
-share/asterisk/sounds/spy-misdn.gsm
-share/asterisk/sounds/spy-mobile.gsm
-share/asterisk/sounds/spy-nbs.gsm
-share/asterisk/sounds/spy-sip.gsm
-share/asterisk/sounds/spy-skinny.gsm
-share/asterisk/sounds/spy-unistim.gsm
-share/asterisk/sounds/spy-usbradio.gsm
-share/asterisk/sounds/spy-zap.gsm
-share/asterisk/sounds/ss-noservice.gsm
-share/asterisk/sounds/transfer.gsm
-share/asterisk/sounds/tt-allbusy.gsm
-share/asterisk/sounds/tt-monkeys.gsm
-share/asterisk/sounds/tt-monkeysintro.gsm
-share/asterisk/sounds/tt-somethingwrong.gsm
-share/asterisk/sounds/tt-weasels.gsm
-share/asterisk/sounds/vm-Cust1.gsm
-share/asterisk/sounds/vm-Cust2.gsm
-share/asterisk/sounds/vm-Cust3.gsm
-share/asterisk/sounds/vm-Cust4.gsm
-share/asterisk/sounds/vm-Cust5.gsm
-share/asterisk/sounds/vm-Family.gsm
-share/asterisk/sounds/vm-Friends.gsm
-share/asterisk/sounds/vm-INBOX.gsm
-share/asterisk/sounds/vm-Old.gsm
-share/asterisk/sounds/vm-Urgent.gsm
-share/asterisk/sounds/vm-Work.gsm
-share/asterisk/sounds/vm-advopts.gsm
-share/asterisk/sounds/vm-and.gsm
-share/asterisk/sounds/vm-calldiffnum.gsm
-share/asterisk/sounds/vm-changeto.gsm
-share/asterisk/sounds/vm-delete.gsm
-share/asterisk/sounds/vm-deleted.gsm
-share/asterisk/sounds/vm-dialout.gsm
-share/asterisk/sounds/vm-duration.gsm
-share/asterisk/sounds/vm-enter-num-to-call.gsm
-share/asterisk/sounds/vm-extension.gsm
-share/asterisk/sounds/vm-first.gsm
-share/asterisk/sounds/vm-for.gsm
-share/asterisk/sounds/vm-forward-multiple.gsm
-share/asterisk/sounds/vm-forward.gsm
-share/asterisk/sounds/vm-forwardoptions.gsm
-share/asterisk/sounds/vm-from-extension.gsm
-share/asterisk/sounds/vm-from-phonenumber.gsm
-share/asterisk/sounds/vm-from.gsm
-share/asterisk/sounds/vm-goodbye.gsm
-share/asterisk/sounds/vm-helpexit.gsm
-share/asterisk/sounds/vm-incorrect-mailbox.gsm
-share/asterisk/sounds/vm-incorrect.gsm
-share/asterisk/sounds/vm-instructions.gsm
-share/asterisk/sounds/vm-intro.gsm
-share/asterisk/sounds/vm-invalid-password.gsm
-share/asterisk/sounds/vm-invalidpassword.gsm
-share/asterisk/sounds/vm-isonphone.gsm
-share/asterisk/sounds/vm-isunavail.gsm
-share/asterisk/sounds/vm-last.gsm
-share/asterisk/sounds/vm-leavemsg.gsm
-share/asterisk/sounds/vm-login.gsm
-share/asterisk/sounds/vm-mailboxfull.gsm
-share/asterisk/sounds/vm-marked-nonurgent.gsm
-share/asterisk/sounds/vm-marked-urgent.gsm
-share/asterisk/sounds/vm-message.gsm
-share/asterisk/sounds/vm-messages.gsm
-share/asterisk/sounds/vm-minutes.gsm
-share/asterisk/sounds/vm-mismatch.gsm
-share/asterisk/sounds/vm-msginstruct.gsm
-share/asterisk/sounds/vm-msgsaved.gsm
-share/asterisk/sounds/vm-newpassword.gsm
-share/asterisk/sounds/vm-newuser.gsm
-share/asterisk/sounds/vm-next.gsm
-share/asterisk/sounds/vm-no.gsm
-share/asterisk/sounds/vm-nobodyavail.gsm
-share/asterisk/sounds/vm-nobox.gsm
-share/asterisk/sounds/vm-nomore.gsm
-share/asterisk/sounds/vm-nonumber.gsm
-share/asterisk/sounds/vm-num-i-have.gsm
-share/asterisk/sounds/vm-onefor-full.gsm
-share/asterisk/sounds/vm-onefor.gsm
-share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts-full.gsm
-share/asterisk/sounds/vm-opts.gsm
-share/asterisk/sounds/vm-passchanged.gsm
-share/asterisk/sounds/vm-password.gsm
-share/asterisk/sounds/vm-pls-try-again.gsm
-share/asterisk/sounds/vm-press.gsm
-share/asterisk/sounds/vm-prev.gsm
-share/asterisk/sounds/vm-reachoper.gsm
-share/asterisk/sounds/vm-rec-busy.gsm
-share/asterisk/sounds/vm-rec-name.gsm
-share/asterisk/sounds/vm-rec-temp.gsm
-share/asterisk/sounds/vm-rec-unv.gsm
-share/asterisk/sounds/vm-received.gsm
-share/asterisk/sounds/vm-record-prepend.gsm
-share/asterisk/sounds/vm-reenterpassword.gsm
-share/asterisk/sounds/vm-repeat.gsm
-share/asterisk/sounds/vm-review-nonurgent.gsm
-share/asterisk/sounds/vm-review-urgent.gsm
-share/asterisk/sounds/vm-review.gsm
-share/asterisk/sounds/vm-saved.gsm
-share/asterisk/sounds/vm-savedto.gsm
-share/asterisk/sounds/vm-savefolder.gsm
-share/asterisk/sounds/vm-savemessage.gsm
-share/asterisk/sounds/vm-saveoper.gsm
-share/asterisk/sounds/vm-sorry.gsm
-share/asterisk/sounds/vm-star-cancel.gsm
-share/asterisk/sounds/vm-starmain.gsm
-share/asterisk/sounds/vm-tempgreetactive.gsm
-share/asterisk/sounds/vm-tempgreeting.gsm
-share/asterisk/sounds/vm-tempgreeting2.gsm
-share/asterisk/sounds/vm-tempremoved.gsm
-share/asterisk/sounds/vm-then-pound.gsm
-share/asterisk/sounds/vm-theperson.gsm
-share/asterisk/sounds/vm-tmpexists.gsm
-share/asterisk/sounds/vm-tocallback.gsm
-share/asterisk/sounds/vm-tocallnum.gsm
-share/asterisk/sounds/vm-tocancel.gsm
-share/asterisk/sounds/vm-tocancelmsg.gsm
-share/asterisk/sounds/vm-toenternumber.gsm
-share/asterisk/sounds/vm-toforward.gsm
-share/asterisk/sounds/vm-tohearenv.gsm
-share/asterisk/sounds/vm-tomakecall.gsm
-share/asterisk/sounds/vm-tooshort.gsm
-share/asterisk/sounds/vm-toreply.gsm
-share/asterisk/sounds/vm-torerecord.gsm
-share/asterisk/sounds/vm-undelete.gsm
-share/asterisk/sounds/vm-undeleted.gsm
-share/asterisk/sounds/vm-unknown-caller.gsm
-share/asterisk/sounds/vm-whichbox.gsm
-share/asterisk/sounds/vm-youhave.gsm
-share/asterisk/static-http/ajamdemo.html
-share/asterisk/static-http/astman.css
-share/asterisk/static-http/astman.js
-share/asterisk/static-http/prototype.js
-@dirrm share/asterisk/static-http
-@dirrm share/asterisk/sounds/silence
-@dirrm share/asterisk/sounds/phonetic
-@dirrm share/asterisk/sounds/letters
-@dirrm share/asterisk/sounds/fr
-@dirrm share/asterisk/sounds/followme
-@dirrm share/asterisk/sounds/es
-@dirrm share/asterisk/sounds/digits
-@dirrm share/asterisk/sounds/dictate
-@dirrm share/asterisk/sounds
-@dirrm share/asterisk/moh
-@dirrm share/asterisk/keys
-@dirrm share/asterisk/images
-@dirrm share/asterisk/firmware/iax
-@dirrm share/asterisk/firmware
-@dirrm share/asterisk/agi-bin
-@dirrm share/asterisk
-@dirrm lib/asterisk/modules
-@dirrm lib/asterisk
-@dirrm include/asterisk
-@dirrmtry etc/asterisk
-@exec mkdir -p %D/share/asterisk/sounds/fr
-@exec mkdir -p %D/share/asterisk/sounds/es
-@cwd /var
-spool/asterisk/voicemail/default/1234/busy.gsm
-spool/asterisk/voicemail/default/1234/unavail.gsm
-@exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/log/asterisk/cdr-custom
-@exec mkdir -p %D/spool/asterisk/dictate
-@exec mkdir -p %D/spool/asterisk/meetme
-@exec mkdir -p %D/spool/asterisk/monitor
-@exec mkdir -p %D/spool/asterisk/system
-@exec mkdir -p %D/spool/asterisk/tmp
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234/INBOX
-@dirrm spool/asterisk/voicemail/default/1234
-@dirrm spool/asterisk/voicemail/default
-@dirrm spool/asterisk/voicemail
-@dirrm spool/asterisk/tmp
-@dirrm spool/asterisk/system
-@dirrm spool/asterisk/monitor
-@dirrm spool/asterisk/meetme
-@dirrm spool/asterisk/dictate
-@dirrm spool/asterisk
-@dirrm log/asterisk/cdr-custom
-@dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk
diff --git a/net/astfax/Makefile b/net/astfax/Makefile
deleted file mode 100644
index ab8cbbaf09e1..000000000000
--- a/net/astfax/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for:   astfax
-# Date created:                 13 Aug 2005
-# Whom:				Filippo Natali <filippo.natali@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	astfax
-PORTVERSION=	1.0
-PORTREVISION=	11
-CATEGORIES=	net
-MASTER_SITES=	http://www.inter7.com/astfax/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	AstFax provides an outgoing email to fax gateway for Asterisk
-
-DEPRECATED=	Depends on net/asterisk14, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
-LIB_DEPENDS=	spandsp.1:${PORTSDIR}/comms/spandsp
-BUILD_DEPENDS=	${LOCALBASE}/lib/libeps.a:${PORTSDIR}/mail/eps
-RUN_DEPENDS=	${LOCALBASE}/sbin/asterisk:${PORTSDIR}/net/asterisk14
-
-MAKE_JOBS_SAFE=  yes
-
-PORTDOCS=	README testfax.eml testfax.tif
-
-MAKE_ENV+=	DEFS="${CFLAGS}"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CC =|CC \?=|' \
-			  -e 's|^DEFS =|DEFS \?=|' \
-			  -e 's|\/usr\/include\/eps|${LOCALBASE}\/include\/eps|' \
-			  -e 's|^LIBS=-leps|LIBS=-leps -L${LOCALBASE}\/lib|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|"\/tmp"|"\/var\/tmp"|' \
-			  -e 's|"\./ast_fax.call"|"${DATADIR}\/ast_fax.call"|' \
-		${WRKSRC}/ast_fax.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ast_fax ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ast_fax.call ${DATADIR}
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	for f in ${PORTDOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
-	done
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/astfax/distinfo b/net/astfax/distinfo
deleted file mode 100644
index e8c5b24d0ec2..000000000000
--- a/net/astfax/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (astfax-1.0.tar.gz) = 7307e01aad625b90922253aa6c03afc415cb59db7eaf42d7b040b847565524f6
-SIZE (astfax-1.0.tar.gz) = 8664
diff --git a/net/astfax/pkg-descr b/net/astfax/pkg-descr
deleted file mode 100644
index a1ba56abaa7e..000000000000
--- a/net/astfax/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-AstFax provides an outgoing email to fax gateway for the Asterisk PBX package.
-Incoming fax to email can also be configured so your Asterisk server can act
-as both an outgoing and incoming fax server.
-
-Features
-
-    * Written in C
-    * Processes large email messages quickly with the EPS library
-    * Easy to use, simply send an email to the fax number
-    * Configures easily with Asterisk, and most Unix-based MTAs 
-
-WWW: http://www.inter7.com/index.php?page=astfax
diff --git a/net/astfax/pkg-plist b/net/astfax/pkg-plist
deleted file mode 100644
index 603624c7b216..000000000000
--- a/net/astfax/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/ast_fax
-%%DATADIR%%/ast_fax.call
-@dirrm %%DATADIR%%
diff --git a/net/isc-dhcp31-client/Makefile b/net/isc-dhcp31-client/Makefile
deleted file mode 100644
index 6bfa7a7cd809..000000000000
--- a/net/isc-dhcp31-client/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-COMMENT=	The ISC Dynamic Host Configuration Protocol client
-
-FORBIDDEN=	Vulnerable since 2011-04-10, http://portaudit.freebsd.org/7e69f00d-632a-11e0-9f3a-001d092480a4.html
-EXPIRATION_DATE=	2011-10-14
-
-# Local variables
-#
-
-SUBSYS=		client
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp31-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp31-client/pkg-descr b/net/isc-dhcp31-client/pkg-descr
deleted file mode 100644
index 7dc1bc78ea95..000000000000
--- a/net/isc-dhcp31-client/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client (this port)
-  * A DHCP relay agent
-
-Version 3 of the ISC DHCP Distribution includes the following features
-that are new since version 2.0:
-
-  * DHCP Failover Protocol support
-  * OMAPI, an API for accessing and modifying the DHCP server and client state
-  * Conditional behaviour
-  * Storing arbitrary information on leases
-  * Address pools with access control
-  * Client classing
-  * Address allocation restriction by class
-  * Relay agent information option support 
-  * Dynamic DNS updates
-  * Many bug fixes, performance enhancements, and minor new DHCP protocol
-    features. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-client/pkg-message b/net/isc-dhcp31-client/pkg-message
deleted file mode 100644
index b406fd04fbd8..000000000000
--- a/net/isc-dhcp31-client/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-****  To setup dhclient, you may need to edit /etc/rc.conf to replace the
-      base system dhclient, such as :
-
-	    dhcp_program="%%PREFIX%%/sbin/dhclient"
-	    dhcp_flags="-q"
-
-      See dhclient(8), using the following command, for details about other
-      possible options:
-
-	    MANPATH=%%MAN1PREFIX%%/man man 8 dhclient
diff --git a/net/isc-dhcp31-client/pkg-plist b/net/isc-dhcp31-client/pkg-plist
deleted file mode 100644
index 1c8e80e6c6eb..000000000000
--- a/net/isc-dhcp31-client/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-client/Attic/pkg-plist,v 1.3 2004-06-26 08:46:05 eik Exp $
-etc/dhclient.conf.sample
-@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf
-@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf
-sbin/dhclient
-sbin/dhclient-script
-@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
-@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases
diff --git a/net/isc-dhcp31-relay/Makefile b/net/isc-dhcp31-relay/Makefile
deleted file mode 100644
index 6536811d7e56..000000000000
--- a/net/isc-dhcp31-relay/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         28 April 2003
-# Whom:                 cyrille.lefevre@laposte.net
-#
-# $FreeBSD$
-#
-
-COMMENT=	The ISC Dynamic Host Configuration Protocol relay
-
-# Local variables
-#
-
-SUBSYS=		relay
-
-# Local overrides
-#
-
-MASTERDIR=	${.CURDIR}/../isc-dhcp31-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/isc-dhcp31-relay/pkg-descr b/net/isc-dhcp31-relay/pkg-descr
deleted file mode 100644
index b764dbf45a19..000000000000
--- a/net/isc-dhcp31-relay/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server
-  * A DHCP client
-  * A DHCP relay agent (this port)
-
-Version 3 of the ISC DHCP Distribution includes the following features
-that are new since version 2.0:
-
-  * DHCP Failover Protocol support
-  * OMAPI, an API for accessing and modifying the DHCP server and client state
-  * Conditional behaviour
-  * Storing arbitrary information on leases
-  * Address pools with access control
-  * Client classing
-  * Address allocation restriction by class
-  * Relay agent information option support 
-  * Dynamic DNS updates
-  * Many bug fixes, performance enhancements, and minor new DHCP protocol
-    features. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-relay/pkg-message b/net/isc-dhcp31-relay/pkg-message
deleted file mode 100644
index c0917bf31b63..000000000000
--- a/net/isc-dhcp31-relay/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-****  This port installs dhcp relay daemon, but doesn't invoke dhcrelay by
-      default. If you want to invoke dhcrelay at startup, put these lines
-      into /etc/rc.conf.
-
-	    dhcrelay_enable="YES"
-	    dhcrelay_flags=""		# command option(s)
-	    dhcrelay_servers=""		# dhcrelay server(s)
-	    dhcrelay_ifaces=""		# ethernet interface(s)
-
-****  For instance, rc.conf like variables are still read from
-      %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move
-      into /etc/rc.conf. Also, the dhcrelay_options variable
-      must be renamed dhcrelay_flags.
diff --git a/net/isc-dhcp31-relay/pkg-plist b/net/isc-dhcp31-relay/pkg-plist
deleted file mode 100644
index 1e66232a86cc..000000000000
--- a/net/isc-dhcp31-relay/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
-@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
-sbin/dhcrelay
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
deleted file mode 100644
index d1ad8154b4af..000000000000
--- a/net/isc-dhcp31-server/Makefile
+++ /dev/null
@@ -1,268 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:    dhcp
-# Date created:         7 Mar 1996
-# Whom:                 se
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dhcp
-PORTVERSION=	3.1.ESV
-PORTEPOCH=	1
-PORTREVISION=	${DHCP_PORTREVISION}
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	dhcp dhcp/dhcp-3.1-history
-PKGNAMEPREFIX=	isc-
-PKGNAMESUFFIX=	31-${SUBSYS}
-DISTNAME=	${PORTNAME}-3.1-ESV-R3
-
-MAINTAINER=	jpaetzel@FreeBSD.org
-COMMENT?=	The ISC Dynamic Host Configuration Protocol server
-
-PORTREVISION_SERVER=	1
-PORTREVISION_CLIENT=	0
-PORTREVISION_RELAY=	0
-PORTREVISION_DEVEL=	0
-
-SUBSYS?=	server
-
-UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-.if ${SUBSYS} == client
-OPTIONS=	INTERFACE_POLLING "interface polling support" on
-.endif
-.if ${SUBSYS} == server
-OPTIONS=	DHCP_PARANOIA "add -user, -group and -chroot options" on \
-		DHCP_JAIL "add -chroot and -jail options" on \
-		DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \
-		OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \
-		OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off
-.endif
-
-# PORTREVISION handling
-.if ${SUBSYS} == client
-CONFLICTS=	isc-dhcp4[1-9]-client*
-DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
-.elif ${SUBSYS} == relay
-CONFLICTS=	isc-dhcp4[1-9]-relay*
-DHCP_PORTREVISION=	${PORTREVISION_RELAY}
-.elif ${SUBSYS} == devel
-DHCP_PORTREVISION=	${PORTREVISION_DEVEL}
-.else
-CONFLICTS=	isc-dhcp4[1-9]-server*
-DHCP_PORTREVISION=	${PORTREVISION_SERVER}
-.endif
-
-.include <bsd.port.pre.mk>
-
-# Global variables
-#
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--subsys ${SUBSYS}
-ALL_TARGET=	all.${SUBSYS}
-INSTALL_TARGET=	install.${SUBSYS}
-SCRIPTS_ENV+=	PKG_PREFIX=${PREFIX}
-
-.if ${SUBSYS} == client
-MAN5=		dhclient.conf.5 dhclient.leases.5
-MAN8=		dhclient.8 dhclient-script.8
-.elif ${SUBSYS} == server
-MAN1=		omshell.1
-MAN5=		dhcpd.conf.5 dhcpd.leases.5
-MAN8=		dhcpd.8
-.elif ${SUBSYS} == relay
-MAN8=		dhcrelay.8
-.else
-MAN3=		dhcpctl.3 omapi.3
-.endif
-.if ${SUBSYS} != relay
-MAN5+=		dhcp-eval.5 dhcp-options.5
-.endif
-
-MSG_FILE=	${.CURDIR}/pkg-message
-DESCR=		${.CURDIR}/pkg-descr
-PKGINSTALL=	${.CURDIR}/pkg-install
-PKGDEINSTALL=	${PKGINSTALL}
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${.CURDIR}/pkg-plist
-
-
-PATCH_SUBDIRS=	common minires dst omapip
-.if ${SUBSYS} == server || ${SUBSYS} == devel
-PATCH_SUBDIRS+=	dhcpctl
-.endif
-.if ${SUBSYS} != devel
-PATCH_SUBDIRS+=	${SUBSYS}
-.endif
-.if ${SUBSYS} == server
-PATCH_SUBDIRS+=	omshell
-.endif
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	LICENSE README RELNOTES
-.endif
-.if ${SUBSYS} == client
-BIN_FILES=	dhclient
-LOCAL_CONF_FILES=	dhclient.conf
-SAMP_FILES=	client/dhclient.conf
-DATA_FILES=	dhclient.leases
-.elif ${SUBSYS} == server
-BIN_FILES=	dhcpd omshell
-USE_RC_SUBR=	isc-dhcpd
-SAMP_FILES=	server/dhcpd.conf
-DATA_FILES=	dhcpd.leases
-.elif ${SUBSYS} == relay
-BIN_FILES=	dhcrelay
-USE_RC_SUBR=	isc-dhcrelay
-.endif
-
-SAMP_SUFX=	.sample
-
-CONF_DIR=	${PREFIX}/etc
-SCHEMA_DIR=	${PREFIX}/share/${PKGBASE}
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-DATADIR=	/var/db
-
-PLIST_SUB+=	SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}"
-PLIST_SUB+=	LDAP="@comment "
-REINPLACE_SUB=	PREFIX=${PREFIX}
-.if !defined(WITHOUT_DHCP_PARANOIA)
-SUB_LIST+=	PARANOIA=YES
-.else
-SUB_LIST+=	PARANOIA=NO
-.endif
-.if !defined(WITHOUT_DHCP_JAIL)
-SUB_LIST+=	JAIL=YES
-.else
-SUB_LIST+=	JAIL=NO
-.endif
-PKGMESSAGE_SUB=	PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
-		DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
-
-# Post-extract
-#
-
-post-extract: extract-omshell extract-script
-
-extract-omshell:
-	@${MKDIR} ${WRKSRC}/omshell
-	@${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell
-	@${CP} ${FILESDIR}/omshell::Makefile.dist \
-		${WRKSRC}/omshell/Makefile.dist
-
-extract-script:
-	@${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd
-
-# Post-patch
-#
-
-post-patch: patch-scripts patch-makefile-conf \
-	    patch-makefiles-dist patch-man-pages \
-	    patch-pkgmessage patch-site-conf
-
-patch-scripts:
-	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf \
-		${WRKSRC}/client/scripts/freebsd
-
-patch-site-conf:
-.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING)
-	@${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf
-.endif
-.if ${SUBSYS} == server
-.if !defined(WITHOUT_DHCP_PARANOIA)
-	@${ECHO_CMD} CFLAGS += -DPARANOIA >> ${WRKSRC}/site.conf
-.endif
-.if !defined(WITHOUT_DHCP_JAIL)
-	@${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf
-.if defined(WITH_DHCP_SOCKETS)
-	@${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf
-.endif
-.endif
-.endif
-
-patch-makefile-conf:
-	@${REINPLACE_CMD} -e 's|^DEBUG[ 	]*=|# DEBUG ?=|g' \
-		${WRKSRC}/Makefile.conf
-
-patch-makefiles-dist:
-.for subdir in ${PATCH_SUBDIRS}
-	@${REINPLACE_CMD} -e 's|^CFLAGS[ 	]*=|CFLAGS +=|g' \
-		${WRKSRC}/${subdir}/Makefile.dist
-.endfor
-
-# temporary hack - no patch file needed for this typo.
-patch-man-pages:
-	@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-
-patch-pkgmessage:
-.if ${SUBSYS} != devel
-	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${MSG_FILE} > ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE}
-.endif
-
-# Post-install
-#
-
-POST-INSTALL=	parallel-post-install install-rc-script configure-package \
-		display-message
-.ORDER: ${POST-INSTALL}
-post-install: ${POST-INSTALL}
-
-parallel-post-install: \
-	strip-binary-files \
-	install-doc-files install-sample-files \
-	create-conf-files create-data-files
-
-strip-binary-files:
-.for f in ${BIN_FILES}
-.if exists(${PREFIX}/bin/${f})
-	@${STRIP_CMD} ${PREFIX}/bin/${f}
-.endif
-.if exists(${PREFIX}/sbin/${f})
-	@${STRIP_CMD} ${PREFIX}/sbin/${f}
-.endif
-.endfor
-
-install-doc-files:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
-
-install-sample-files:
-.for f in ${SAMP_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX}
-.endfor
-
-create-conf-files:
-.for f in ${LOCAL_CONF_FILES}
-.if !exists(${CONF_DIR}/${f})
-	@${TOUCH} ${CONF_DIR}/${f}
-.endif
-.endfor
-
-create-data-files:
-.for f in ${DATA_FILES}
-.if !exists(${DATADIR}/${f})
-	@${TOUCH} ${DATADIR}/${f}
-.endif
-.endfor
-
-configure-package:
-.if ${SUBSYS} == server
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
-display-message:
-.if ${SUBSYS} != devel
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
deleted file mode 100644
index 639f2d31c4d2..000000000000
--- a/net/isc-dhcp31-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dhcp-3.1-ESV-R3.tar.gz) = fb86e124c1fe57d6d6376ceb3eb025320cce5b98002b614e1540fc21a88d6bc6
-SIZE (dhcp-3.1-ESV-R3.tar.gz) = 799075
diff --git a/net/isc-dhcp31-server/files/client::scripts::freebsd b/net/isc-dhcp31-server/files/client::scripts::freebsd
deleted file mode 100644
index 9c4c3d3a6f24..000000000000
--- a/net/isc-dhcp31-server/files/client::scripts::freebsd
+++ /dev/null
@@ -1,510 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-#
-# Copyright (c) 1999, MindStep Corporation
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-#############################################################################
-#
-# This script was written by Patrick Bihan-Faou, patrick@mindstep.com,
-# Please contact us for bug reports, etc.
-#
-#############################################################################
-# $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $
-# $MindStep_Tag: CONTRIB_19991207 $
-# from FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp
-# $FreeBSD$
-#############################################################################
-
-
-#############################################################################
-# hook functions prototypes
-#
-# The "pre_state_XXX_hook" functions are called before the main
-# work is done for the state XXX
-#
-# The "post_state_XXX_hook" functions are called after the main
-# work is done for the state XXX
-#
-# These functions are meant to be overridden by the user's
-# dhclient-enter-hooks file
-#############################################################################
-
-pre_state_MEDIUM_hook () { }
-pre_state_PREINIT_hook () { }
-pre_state_ARPCHECK_hook () { }
-pre_state_ARPSEND_hook () { }
-pre_state_RENEW_hook () { }
-pre_state_REBIND_hook () { }
-pre_state_BOUND_hook () { }
-pre_state_REBOOT_hook () { }
-pre_state_EXPIRE_hook () { }
-pre_state_FAIL_hook () { }
-pre_state_TIMEOUT_hook () { }
-post_state_MEDIUM_hook () { }
-post_state_PREINIT_hook () { }
-post_state_ARPCHECK_hook () { }
-post_state_ARPSEND_hook () { }
-post_state_RENEW_hook () { }
-post_state_REBIND_hook () { }
-post_state_BOUND_hook () { }
-post_state_REBOOT_hook () { }
-post_state_EXPIRE_hook () { }
-post_state_FAIL_hook () { }
-post_state_TIMEOUT_hook () { }
-
-#############################################################################
-# make_resolv_conf
-#
-# This function is called to update the information related to the
-# DNS configuration (the resolver part)
-#############################################################################
-make_resolv_conf () 
-{
-   if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then
-     echo search $new_domain_name >/etc/resolv.conf
-     for nameserver in $new_domain_name_servers; do
-       echo nameserver $nameserver >>/etc/resolv.conf
-     done
-   fi
-}
-
-#############################################################################
-# set_XXX
-# unset_XXX
-#
-# These function each deal with one particular setting.
-# They are OS dependent and may be overridden in the 
-# dhclient-enter-hooks file if needed.
-#
-# These functions are called with either "new" or "old" to indicate which
-# set of variables to use (new_ip_address or old_ip_address...)
-#
-#############################################################################
-
-update_hostname ()
-{
-	local current_hostname=`/bin/hostname`
-
-  	if	[ "$current_hostname" = "" ] || \
-		[ "$current_hostname" = "$old_host_name" ]
-	then
-		if [ "$new_host_name" != "$old_host_name" ]
-		then
-			$LOGGER "New Hostname: $new_host_name"
-			hostname $new_host_name
-		fi
-	fi
-}
-
-set_ip_address () 
-{
-	local ip
-	local mask
-	local bcast
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval ip="\$${1}_ip_address"
-	eval mask="\$${1}_subnet_mask"
-	eval bcast="\$${1}_broadcast_address"
-
-	if [ "$ip" != "" ]
-	then
-		ifconfig $interface inet $ip netmask $mask broadcast $bcast $medium
-#		route add $ip 127.0.0.1 > /dev/null 2>&1
-	fi
-}
-
-unset_ip_address () 
-{
-	local ip
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval ip="\$${1}_ip_address"
-
-	if [ "$ip" != "" ]
-	then
-		ifconfig $interface inet -alias $ip $medium
-#		route delete $ip 127.0.0.1 > /dev/null 2>&1
-	fi
-}
-
-set_ip_alias () 
-{
-	if [ "$alias_ip_address" != "" ]
-	then
-		ifconfig $interface inet alias $alias_ip_address netmask $alias_subnet_mask
-#		route add $alias_ip_address 127.0.0.1
-	fi
-}
-
-unset_ip_alias () 
-{
-	if [ "$alias_ip_address" != "" ]
-	then
-		ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1
-#		route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
-	fi
-}
-
-set_routers () 
-{
-	local router_list
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval router_list="\$${1}_routers"
-
-	for router in $router_list
-	do
-		route add default $router >/dev/null 2>&1
-	done
-}
-
-unset_routers () 
-{
-	local router_list
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval router_list="\$${1}_routers"
-
-	for router in $router_list
-	do
-		route delete default $router >/dev/null 2>&1
-	done
-}
-
-set_static_routes () 
-{
-	local static_routes
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval static_routes="\$${1}_static_routes"
-
-	set static_routes
-
-	while [ $# -ge 2 ]
-	do
-		$LOGGER "New Static Route: $1 -> $2"
-		route add $1 $2
-		shift; shift
-	done
-}
-
-unset_static_routes () 
-{
-	local static_routes
-
-	if [ $# -lt 1 ]
-	then
-		return  1
-	fi
-
-	eval static_routes="\$${1}_static_routes"
-
-	set static_routes
-
-	while [ $# -ge 2 ]
-	do
-		route delete $1 $2
-		shift; shift
-	done
-}
-
-#############################################################################
-#
-# utility functions grouping what needs to be done in logical units.
-#
-#############################################################################
-
-set_all ()
-{
-	set_ip_address new
-	set_routers new
-	set_static_routes new
-
-	if	[ "$new_ip_address" != "$alias_ip_address" ]
-	then
-		set_ip_alias
-	fi
-}
-
-set_others ()
-{
-	update_hostname
-	make_resolv_conf
-}
-
-clear_arp_table () 
-{
-	arp -d -a
-}
-
-unset_all ()
-{
-	if [ "$alias_ip_address" != "$old_ip_address" ]
-	then
-		unset_ip_alias
-	fi
-
-	if [ "$old_ip_address" != "" ] 
-	then
-		unset_ip_address old
-		unset_routers old
-		unset_static_routes old
-		clear_arp_table
-	fi
-}
-
-test_new_lease () 
-{
-	local rc
-
-	set $new_routers
-
-	if [ $# -ge 1 ]
-	then
-		set_ip_address new
-		if ping -q -c 1 $1
-		then
-			rc=0
-		else
-			rc=1
-		fi
-		unset_ip_address new
-	else
-		rc=1
-	fi
-	return  $rc
-}
-
-#############################################################################
-# Main State functions.
-#
-# There is a state function for each state of the DHCP client
-# These functions are OS specific and should be be tampered with.
-#############################################################################
-
-in_state_MEDIUM () 
-{
-  ifconfig $interface $medium
-  ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1
-  sleep 1
-  exit_status=0
-}
-
-in_state_PREINIT () 
-{
-	unset_ip_alias
-
-	ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
-			broadcast 255.255.255.255 up
-	exit_status=0
-}
-
-in_state_ARPCHECK () 
-{
-  exit_status=0
-}
-
-in_state_ARPSEND () 
-{
-  exit_status=0
-}
-
-in_state_RENEW () 
-{
-	if [ "$old_ip_address" != "$new_ip_address" ]
-	then
-		unset_all
-		set_all
-	fi
-
-	set_others
-}
-
-in_state_REBIND () {
-	in_state_RENEW
-}
-
-in_state_BOUND () {
-	unset_all
-	set_all
-	set_others
-}
-
-in_state_REBOOT () {
-	in_state_BOUND
-}
-
-in_state_EXPIRE () 
-{
-	unset_all
-	set_ip_alias
-	exit_status=0
-}
-
-in_state_FAIL () {
-	in_state_EXPIRE
-}
-
-in_state_TIMEOUT () 
-{
-	unset_all
-
-	if test_new_lease
-	then
-		set_all
-		set_others
-	else
-	 	$LOGGER "No good lease information in TIMEOUT state"	
-		set_ip_alias
-		exit_status=1
-	fi
-}
-
-#############################################################################
-# Main functions:
-#
-# dhclient_script_init() parses the optional "enter_hooks" script which can
-#   override any of the state functions
-#
-# This function also parses the variables and notifies the detected changes.
-#############################################################################
-dhclient_script_init ()
-{
-	if [ "$new_network_number" != "" ]
-	then
-		$LOGGER "New Network Number: $new_network_number"
-	fi
-
-	if [ "$new_ip_address" != "" ]
-	then
-		$LOGGER "New IP Address: $new_ip_address"
-	fi
-
-	if [ "$new_broadcast_address" != "" ]
-	then
-		$LOGGER "New Broadcast Address: $new_broadcast_address"
-	fi
-
-	if [ "$new_subnet_mask" != "" ]
-	then
-		$LOGGER "New Subnet Mask for $interface: $new_subnet_mask"
-	fi
-
-	if [ "$alias_subnet_mask" != "" ]
-	then
-	fi
-}
-
-#############################################################################
-# dhclient_main() does the appropriate work depending on the state of
-# the dhcp client
-#############################################################################
-dhclient_script_main ()
-{
-#	set -x
-	exit_status=0
-
-	case $reason in
-		MEDIUM|\
-		PREINIT|\
-		ARPCHECK|\
-		ARPSEND|\
-		RENEW|\
-		REBIND|\
-		BOUND|\
-		REBOOT|\
-		EXPIRE|\
-		FAIL|\
-		TIMEOUT)
-			pre_state_${reason}_hook
-			in_state_${reason}
-			post_state_${reason}_hook
-			;;
-		*)
-			$LOGGER "dhclient-script called with invalid reason $reason"
-			exit_status=1
-			;;
-	esac
-}
-
-#############################################################################
-# Let's do the work...
-#############################################################################
-
-if [ -x /usr/bin/logger ]; then
-	LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
-else
-	LOGGER=echo
-fi
-
-# Invoke the local dhcp client enter hooks, if they exist.
-if [ -x %%PREFIX%%/etc/dhclient-enter-hooks ]
-then
-	exit_status=0
-	. %%PREFIX%%/etc/dhclient-enter-hooks
-	# allow the local script to abort processing of this state
-	# local script must set exit_status variable to nonzero.
-	if [ $exit_status -ne 0 ]
-	then
-		exit $exit_status
-	fi
-fi
-
-dhclient_script_init
-dhclient_script_main
-
-# Invokes the local dhcp client exit hooks, if any.
-if [ -x %%PREFIX%%/etc/dhclient-exit-hooks ]; then
-	. %%PREFIX%%/etc/dhclient-exit-hooks
-fi
-
-exit $exit_status
-
-#############################################################################
-# That's all folks
-#############################################################################
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in
deleted file mode 100644
index 02241cd6c54b..000000000000
--- a/net/isc-dhcp31-server/files/isc-dhcpd.in
+++ /dev/null
@@ -1,748 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable dhcpd:
-#
-# dhcpd_enable="YES"
-#
-
-. /etc/rc.subr
-
-name=dhcpd
-paranoia=%%PARANOIA%%				# compiled in paranoia?
-jail=%%JAIL%%				# compiled in jail?
-
-load_rc_config ${name}
-
-# override these variables in /etc/rc.conf
-dhcpd_enable=${dhcpd_enable:-"NO"}
-# dhcpd_flags=""		# -q -early_chroot	# command option(s)
-# dhcpd_ifaces=""					# ethernet interface(s)
-dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
-dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
-
-dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"}	# runs w/o privileges?
-dhcpd_withuser=${dhcpd_withuser:-${name}}		# user name to run as
-dhcpd_withgroup=${dhcpd_withgroup:-${name}}		# group name to run as
-
-dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
-dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"}		# devfs if available?
-dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"}	# MAKEDEV instead of devfs?
-dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
-# dhcpd_includedir=""			# directory for included config files
-
-# untested
-dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
-# dhcpd_hostname=""					# jail hostname
-# dhcpd_ipaddress=""					# jail ip address
-
-safe_run ()	# rc command [args...]
-{
-	local _rc
-
-	_rc=$1
-	shift
-
-	if [ "${_rc}" -eq 0 ]; then
-		debug safe_run: "$@"
-		"$@" || _rc=1
-	else
-		warn safe_run: "$@"
-	fi
-	return ${_rc}
-}
-
-precious ()	# entry...
-{
-	local _entry _rc
-
-	_rc=0
-	for _entry; do
-		# do nothing if /dev, /var/run or /var/db
-		echo ${_entry} | egrep -q '^//*(dev|var//*(run|db))?/*$' || _rc=1
-	done
-	debug precious: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-lsmod ()	# user group file...
-{
-	local _entry _user _group _rc
-
-	_user=$1 _group=$2
-	shift 2
-
-	_rc=0
-	for _entry; do
-		ls -ld ${_entry} 2> /dev/null |
-		awk -v u=${_user} -v g=${_group} '{
-		    exit ((u && $3 != u) || (g && $4 != g))
-		}' || _rc=1
-	done
-	debug lsmod: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-safe_chmog ()	# entry...
-{
-	local _entry _user _group _usergroup _rc
-
-	_user=${dhcpd_withuser}
-	_group=${dhcpd_withgroup}
-
-	_rc=0
-	if [ -n "${_user}" -o -n "${_group}" ]; then
-		_usergroup=${_user}${_group:+:${_group}}
-		for _entry; do
-			if [ -d ${_entry} ] && mounted ${_entry}; then
-				continue
-			fi
-			if [ -e ${_entry} ] &&
-			   ! precious ${_entry} &&
-			   ! lsmod ${_user} ${_group} ${_entry} &&
-			   ! safe_run ${_rc} chown ${_usergroup} ${_entry}; then
-				warn "unable to change permissions of ${_entry}"
-				_rc=1
-			fi
-		done
-	fi
-	return ${_rc}
-}
-
-safe_mkdir ()	# dir...
-{
-	local _dir _rc
-
-	_rc=0
-	for _dir; do
-		if [ ! -d ${_dir} ] &&
-		   ! precious ${_dir} &&
-		   ! safe_run ${_rc} mkdir -p ${_dir}; then
-			err 1 "unable to create directory ${_dir}"
-			_rc=1
-		fi
-	done
-	safe_run ${_rc} safe_chmog "$@" || _rc=1
-	return ${_rc}
-}
-
-safe_rmdir ()	# dir...
-{
-	local _dir _rc
-
-	_rc=0
-	for _dir; do
-		if [ -d ${_dir} ] &&
-		   ! precious ${_dir} &&
-		   ! mounted ${_dir}; then
-			if safe_run ${_rc} rmdir ${_dir}; then
-				safe_run ${_rc} safe_rmdir ${_dir%/*} || _rc=1
-			else
-				warn "unable to remove directory ${_dir}"
-				_rc=1
-			fi
-		fi
-	done
-	return ${_rc}
-}
-
-safe_touch ()	# file...
-{
-	local _file _rc
-
-	_rc=0
-	for _file; do
-		if [ ! -e ${_file} ] &&
-		   ! safe_run ${_rc} touch ${_file}; then
-			err 1 "unable to create file ${_file}"
-			_rc=1
-		fi
-	done
-	safe_run ${_rc} safe_chmog "$@" || _rc=1
-	return ${_rc}
-}
-
-safe_remove ()	# entry...
-{
-	local _entry _rc
-
-	_rc=0
-	for _entry; do
-		if [ -f ${_entry} ]; then
-			if ! safe_run ${_rc} rm -f ${_entry}; then
-				warn "unable to remove file ${_entry}"
-				_rc=1
-			fi
-		elif [ -d ${_entry} ] &&
-		     ! precious ${_entry} &&
-		     ! mounted ${_entry}; then
-			if ! safe_run ${_rc} rm -rf ${_entry}; then
-				warn "unable to remove directory ${_entry}"
-				_rc=1
-			fi
-		fi
-	done
-	return ${_rc}
-}
-
-safe_copy ()	# src dst
-{
-	local _src _dst _rc
-
-	_src=$1 _dst=$2
-
-	_rc=0
-	if [ -f ${_src} ]; then
-		if ! safe_run ${_rc} safe_remove ${_dst} ||
-		   ! safe_run ${_rc} cp -p ${_src} ${_dst}; then
-			err 1 "unable to copy file ${_src} to ${_dst}"
-			_rc=1
-		fi
-		safe_run ${_rc} safe_chmog ${_dst} || _rc=1
-	elif [ -d ${_src} ] &&
-	     ! precious ${_dst} &&
-	     ! mounted ${_dst}; then
-		if ! safe_run ${_rc} pax -rw -pe -ts "|^${_src}||" \
-		   ${_src} ${_dst}; then
-			err 1 "unable to copy directory ${_src} to ${_dst}"
-			_rc=1
-		fi
-	else
-		err 1 "unable to copy ${_src} to ${_dst}" \
-		      "-- not a file or a directory"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-mounted ()	# dir...
-{
-	local _rc
-
-	_rc=1
-	if checkyesno dhcpd_devfs_enable ||
-	   checkyesno dhcpd_jail_enable; then
-		mount -t devfs | awk '
-		    BEGIN { n = ARGC; ARGC = 2 }
-		    { for (i = 2; i != n; i++) if ($3 == ARGV[i]) exit 1 }
-		' - "$@" || _rc=0
-	fi
-	debug mounted: "$@" rc=${_rc}
-	return ${_rc}
-}
-
-safe_mount ()	# dir
-{
-	local _dir _rc
-
-	_dir=$1
-
-	_rc=0
-	if checkyesno dhcpd_devfs_enable &&
-	   ! mounted ${_dir} &&
-	   ! safe_run ${_rc} mount -t devfs devfs ${_dir}; then
-		err 1 "unable to mount ${_dir}"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-safe_umount ()	# dir
-{
-	local _dir _rc
-
-	_dir=$1
-
-	_rc=0
-	if checkyesno dhcpd_devfs_enable &&
-	   mounted ${_dir} &&
-	   ! safe_run ${_rc} umount ${_dir}; then
-		warn "unable to unmount ${_dir}"
-		_rc=1
-	fi
-	return ${_rc}
-}
-
-safe_useradd ()
-{
-	local _user _group _home _shell _gecos _gid _uid
-
-	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
-	_uid=$4  _gid=$5
-	_home=${6:-/nonexistent} _shell=${7:-/usr/sbin/nologin}
-
-	if [ -n "${_group}" ]; then
-		if pw group show ${_group} 2>/dev/null; then
-			echo "You already have a group \"${_group}\"," \
-			     "so I will use it."
-		elif pw groupadd ${_group} -g ${_gid} -h -; then
-			echo "Added group \"${_group}\"."
-		else
-			echo "Adding group \"${_group}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-	if [ -n "${_user}" ]; then
-		if pw user show ${_user} 2>/dev/null; then
-			echo "You already have a user \"${_user}\"," \
-			     "so I will use it."
-		elif pw useradd ${_user} -u ${_uid} -g ${_group} -h - \
-			-d ${_home} -s ${_shell} -c "${_gecos}"; then
-			echo "Added user \"${_user}\"."
-		else
-			echo "Adding user \"${_user}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-}
-
-check_chuser ()
-{
-	if checkyesno paranoia; then
-		if checkyesno dhcpd_chuser_enable &&
-		   [ -z "${dhcpd_withuser}" -a -z "${dhcpd_withgroup}" ]; then
-			err 1 "one of dhcpd_withuser and dhcpd_withgroup" \
-			      "must be set if dhcpd_chuser_enable is enabled"
-		fi
-	else
-		if checkyesno dhcpd_chuser_enable; then
-			warn "dhcpd_chuser_enable disabled -- not compiled in"
-			dhcpd_chuser_enable=NO
-		fi
-	fi
-}
-
-check_jail ()
-{
-	if checkyesno paranoia && checkyesno jail; then
-		if checkyesno dhcpd_jail_enable &&
-		   ! checkyesno dhcpd_chroot_enable; then
-			warn "dhcpd_chroot_enable implied by dhcpd_jail_enable"
-			dhcpd_chroot_enable=YES
-		fi
-		if checkyesno dhcpd_jail_enable &&
-		   [ -n "${dhcpd_hostname}" -a -z "${dhcpd_ipaddress}" ] ||
-		   [ -z "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then
-			err 1 "both dhcpd_hostname and dhcpd_ipaddress" \
-			      "must be set if dhcpd_jail_enable is enabled"
-		fi
-	else
-		if checkyesno dhcpd_jail_enable; then
-			warn "dhcpd_jail_enable disabled -- not compiled in"
-			dhcpd_jail_enable=NO
-		fi
-	fi
-}
-
-check_chroot ()
-{
-	if checkyesno paranoia; then
-		if checkyesno dhcpd_chroot_enable; then
-			if [ -z "${dhcpd_rootdir}" ]; then
-				err 1 "dhcpd_rootdir must be set" \
-				      "if dhcpd_chroot_enable is enabled"
-			fi
-			if checkyesno dhcpd_devfs_enable &&
-			   checkyesno dhcpd_makedev_enable; then
-				err 1 "dhcpd_devfs_enable and dhcpd_makedev_enable" \
-				      "are mutually exclusive. enable only one!"
-			fi
-			if test `uname -r | cut -c 1` -le 6; then
-				if checkyesno dhcpd_devfs_enable &&
-				   ! ( type mount_devfs ) > /dev/null 2>&1;
-				then
-					warn "dhcpd_devfs_enable disabled" \
-					     "-- not available"
-					dhcpd_devfs_enable=NO
-				fi
-			fi
-			if checkyesno dhcpd_makedev_enable &&
-			   ! [ -x ${__dhcpd_devdir}/MAKEDEV ]; then
-				warn "dhcpd_makedev_enable disabled" \
-				     "-- not available"
-				dhcpd_makedev_enable=NO
-			fi
-		else
-			dhcpd_devfs_enable=NO
-			dhcpd_makedev_enable=NO
-		fi
-	else
-		if checkyesno dhcpd_chroot_enable; then
-			warn "dhcpd_chroot_enable disabled -- not compiled in"
-			dhcpd_chroot_enable=NO
-		fi
-		dhcpd_devfs_enable=NO
-		dhcpd_makedev_enable=NO
-	fi
-}
-
-rcvar_chuser ()
-{
-	if checkyesno paranoia && checkyesno dhcpd_chuser_enable; then
-		dhcpd_piddir=${__dhcpd_piddir}/${name}
-		dhcpd_leasesdir=${__dhcpd_leasesdir}/${name}
-	else
-		dhcpd_withuser= dhcpd_withgroup=
-	fi
-}
-
-rcvar_jail ()
-{
-	if ! checkyesno paranoia || ! checkyesno jail ||
-	   ! checkyesno dhcpd_jail_enable; then
-		dhcpd_hostname= dhcpd_ipaddress=
-	fi
-}
-
-rcvar_chroot ()
-{
-	if ! checkyesno paranoia || ! checkyesno dhcpd_chroot_enable; then
-		dhcpd_rootdir=
-	elif checkyesno paranoia && checkyesno dhcpd_chroot_enable; then
-		dhcpd_devdir=${__dhcpd_devdir}
-		dhcpd_etcdir=${__dhcpd_etcdir}
-	fi
-}
-
-rcvar_pidnleases ()
-{
-	if ! checkyesno dhcpd_chuser_enable; then
-		dhcpd_piddir=${__dhcpd_piddir}
-		dhcpd_leasesdir=${__dhcpd_leasesdir}
-	fi
-	dhcpd_pidfile=${dhcpd_piddir}/${name}.pid
-	dhcpd_leasesfile=${dhcpd_leasesdir}/${name}.leases
-	dhcpd_conffile=${dhcpd_conf}	# for convenience only
-	dhcpd_confdir=$(dirname ${dhcpd_conffile})
-}
-
-rcvar_rooted ()
-{
-	_dhcpd_rootdir=${dhcpd_rootdir}
-	_dhcpd_devdir=${dhcpd_rootdir}${dhcpd_devdir}
-	_dhcpd_etcdir=${dhcpd_rootdir}${dhcpd_etcdir}
-	_dhcpd_confdir=${dhcpd_rootdir}${dhcpd_confdir}
-	_dhcpd_includedir=${dhcpd_rootdir}${dhcpd_includedir}
-	_dhcpd_piddir=${dhcpd_rootdir}${dhcpd_piddir}
-	_dhcpd_leasesdir=${dhcpd_rootdir}${dhcpd_leasesdir}
-	_dhcpd_conffile=${dhcpd_rootdir}${dhcpd_conffile}
-	_dhcpd_pidfile=${dhcpd_rootdir}${dhcpd_pidfile}
-	_dhcpd_leasesfile=${dhcpd_rootdir}${dhcpd_leasesfile}
-}
-
-setup_compat ()
-{
-	local dhcpd_rcconf
-
-	# suck in old configuration file and variables
-	#
-	dhcpd_rcconf=${dhcpd_confdir}/rc.isc-dhcpd.conf
-
-	if [ -f ${dhcpd_rcconf} ]; then
-		warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf and/or" \
-		     "/etc/rc.conf.d/${name} instead."
-		. ${dhcpd_rcconf}
-
-		if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcpd_options is obsolete," \
-			     "use dhcpd_flags instead."
-			rc_flags=${dhcpd_options}
-		fi
-	fi
-}
-
-setup_umask ()
-{
-	if [ -n "${dhcpd_withumask}" ]; then
-		umask ${dhcpd_withumask}
-	fi
-}
-
-setup_chroot ()
-{
-	local _mdev _hconf _hosts _ltime _rconf
-
-	_mdev=MAKEDEV
-	_hconf=host.conf
-	_hosts=hosts
-	_ltime=localtime
-	_rconf=resolv.conf
-
-	if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then
-		if ! mounted ${_dhcpd_devdir}; then
-			safe_mkdir ${_dhcpd_devdir}/_
-			# XXX /_ hack! so, .../dev is root owned.
-		fi
-		safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir}
-		# XXX /_ hack! so, .../etc is root owned.
-		if checkyesno dhcpd_devfs_enable; then
-			safe_mount ${_dhcpd_devdir}
-		elif checkyesno dhcpd_makedev_enable; then
-			safe_copy ${dhcpd_devdir}/$_mdev ${_dhcpd_devdir}/$_mdev
-			safe_run 0 sh -c "cd ${_dhcpd_devdir} && ./$_mdev jail bpf4"
-		else
-			safe_copy ${dhcpd_devdir} ${_dhcpd_devdir}
-		fi
-		safe_copy ${dhcpd_conffile} ${_dhcpd_conffile}
-		safe_copy ${dhcpd_etcdir}/$_hconf ${_dhcpd_etcdir}/$_hconf
-		safe_copy ${dhcpd_etcdir}/$_hosts ${_dhcpd_etcdir}/$_hosts
-		safe_copy ${dhcpd_etcdir}/$_ltime ${_dhcpd_etcdir}/$_ltime
-		safe_copy ${dhcpd_etcdir}/$_rconf ${_dhcpd_etcdir}/$_rconf
-		# copy dhcpd_includedir if defined and available
-		if [ -d "${dhcpd_includedir}" ]; then
-			safe_mkdir ${_dhcpd_includedir}
-			safe_copy ${dhcpd_includedir} ${_dhcpd_includedir}
-		fi
-	fi
-}
-
-setup_chuser ()
-{
-	if checkyesno paranoia && {
-	   checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable
-	}; then
-		safe_mkdir ${_dhcpd_piddir} ${_dhcpd_leasesdir}
-	fi
-}
-
-setup_leases ()
-{
-	safe_touch ${_dhcpd_leasesfile}
-}
-
-setup_flags ()
-{
-	if [ -n "${dhcpd_conf}" ]; then
-		rc_flags="${rc_flags} -cf ${dhcpd_conf}"
-	fi
-	if [ -n "${dhcpd_leasesfile}" ]; then
-		rc_flags="${rc_flags} -lf ${dhcpd_leasesfile}"
-	fi
-	if [ -n "${dhcpd_pidfile}" ]; then
-		rc_flags="${rc_flags} -pf ${dhcpd_pidfile}"
-	fi
-	if [ -n "${dhcpd_withuser}" ]; then
-		rc_flags="${rc_flags} -user ${dhcpd_withuser}"
-	fi
-	if [ -n "${dhcpd_withgroup}" ]; then
-		rc_flags="${rc_flags} -group ${dhcpd_withgroup}"
-	fi
-	if [ -n "${dhcpd_rootdir}" ]; then
-		rc_flags="${rc_flags} -chroot ${dhcpd_rootdir}"
-	fi
-	if [ -n "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then
-		rc_flags="${rc_flags} -jail ${dhcpd_hostname} ${dhcpd_ipaddress}"
-	fi
-	rc_flags="${rc_flags} ${dhcpd_ifaces}"
-}
-
-cleanup_chroot ()
-{
-	if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then
-		safe_umount ${_dhcpd_devdir}
-	fi
-}
-
-dhcpd_stop ()
-{
-	if sh $0 forcestatus; then
-		sh $0 forcestop
-	fi
-}
-
-remove_pid ()
-{
-	if [ -e ${_dhcpd_pidfile} ]; then
-		warn "${_dhcpd_pidfile} still exists! -- removing anyway"
-	fi
-	safe_remove ${_dhcpd_pidfile}
-}
-
-remove_leases ()
-{
-	if [ -s ${_dhcpd_leasesfile} ]; then
-		warn "${_dhcpd_leasesfile} not empty -- not removed --" \
-		     "futher warning messages expected, don't care."
-	else
-		safe_remove ${_dhcpd_leasesfile} ${_dhcpd_leasesfile}~
-	fi
-}
-
-remove_chuser ()
-{
-	if checkyesno paranoia && {
-	   checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable
-	}; then
-		safe_rmdir ${_dhcpd_piddir} ${_dhcpd_leasesdir}
-	fi
-}
-
-remove_chroot ()
-{
-	if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then
-		safe_remove ${_dhcpd_conffile} ${_dhcpd_includedir} \
-			${_dhcpd_etcdir}
-		if checkyesno dhcpd_devfs_enable; then
-			safe_umount ${_dhcpd_devdir}
-			safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack!
-		elif checkyesno dhcpd_jail_enable; then
-			if ! mounted ${_dhcpd_devdir}; then
-				safe_remove ${_dhcpd_devdir}
-			fi
-		else
-			safe_remove ${_dhcpd_devdir}
-		fi
-		safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} # XXX /_ hack!
-	fi
-}
-
-dhcpd_check ()
-{
-	check_chuser
-	check_jail
-	check_chroot
-}
-
-dhcpd_rcvar ()
-{
-	rcvar_chuser
-	rcvar_jail
-	rcvar_chroot
-	rcvar_pidnleases
-	rcvar_rooted
-}
-
-dhcpd_precmd ()
-{
-	setup_compat
-	setup_umask
-	setup_chroot
-	setup_chuser
-	setup_leases
-	setup_flags
-}
-
-dhcpd_postcmd ()
-{
-	cleanup_chroot
-}
-
-dhcpd_install ()
-{
-	if checkyesno paranoia; then
-		safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \
-			     "DHCP Daemon" 136 136
-	fi
-}
-
-_dhcpd_uninstall ()	# user group root
-{
-	local _user _group _root
-
-	_user=$1 _group=$2 _root=$3
-
-	if [ -n "${_user}" -o -n "${_group}" ]; then
-		dhcpd_chuser_enable=YES
-		dhcpd_withuser=${_user}
-		dhcpd_withgroup=${_group}
-	else
-		dhcpd_chuser_enable=NO
-	fi
-	if [ -n "${_root}" ]; then
-		dhcpd_chroot_enable=YES
-		dhcpd_rootdir=${_root}
-	else
-		dhcpd_chroot_enable=NO
-	fi
-	dhcpd_check
-	dhcpd_rcvar
-	dhcpd_uninstall
-}
-
-dhcpd_uninstall ()
-{
-	if checkyesno __dhcpd_uninstall; then
-		dhcpd_stop
-		remove_pid
-		remove_leases
-		remove_chuser
-		remove_chroot
-	else
-		local _user _group _root
-
-		__dhcpd_uninstall=YES
-
-		_user=${dhcpd_withuser}
-		_group=${dhcpd_withgroup}
-		_root=${dhcpd_rootdir}
-
-		_dhcpd_uninstall "" "" ""
-
-		if checkyesno paranoia; then
-			if [ -n "${_user}" -o -n "${_group}" ]; then
-				_dhcpd_uninstall "${_user}" "${_group}" ""
-			fi
-			if [ -n "${_root}" ]; then
-				_dhcpd_uninstall "" "" "${_root}"
-			fi
-			if [ -n "${_user}" -o -n "${_group}" ] &&
-			   [ -n "${_root}" ]; then
-				_dhcpd_uninstall "${_user}" "${_group}" "${_root}"
-			fi
-		fi
-	fi
-}
-
-dhcpd_checkconfig ()
-{
-        local rc_flags_mod
-        setup_flags
-	rc_flags_mod="$rc_flags"
-        # Eliminate '-q' flag if it is present
-	case "$rc_flags" in
-	*-q*)	rc_flags_mod=`echo "${rc_flags}" | sed -Ee 's/(^-q | -q | -q$)//'` ;;
-	esac
-        if ! ${command} -t -q ${rc_flags_mod}; then
-                err 1 "`${command} -t ${rc_flags_mod}` Configuration file sanity check failed"
-        fi
-}
-
-rcvar=${name}_enable
-load_rc_config ${name}
-
-__dhcpd_uninstall="NO"			# internal use only
-__dhcpd_devdir=/dev			# devices directory
-__dhcpd_etcdir=/etc			# etc directory
-__dhcpd_piddir=/var/run			# pid file directory
-__dhcpd_leasesdir=/var/db		# leases file directory
-#__dhcpd_rootdir=/var/db/${name}	# root directory
-
-dhcpd_check
-dhcpd_rcvar
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=${_dhcpd_pidfile}
-required_files=${dhcpd_conf}
-start_precmd=${name}_precmd
-stop_postcmd=${name}_postcmd
-restart_precmd="dhcpd_checkconfig"
-install_cmd=dhcpd_install
-uninstall_cmd=dhcpd_uninstall
-extra_commands="install uninstall"
-
-# Override /etc/rc.subr JID determiniation, because it doesn't
-# work when we launch dhcpd in a jail.
-if checkyesno dhcpd_jail_enable ; then
-	read pid junk < $pidfile 2>/dev/null
-	[ -n "$pid" ] && JID=`ps -o jid= -p $pid`
-fi
-
-run_rc_command "$1"
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in
deleted file mode 100644
index faa26e0d402b..000000000000
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dhcrelay
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable dhcrelay:
-#
-# dhcrelay_enable="YES"
-#
-
-# override these variables in /etc/rc.conf
-dhcrelay_enable=${dhcrelay_enable:-"NO"}
-# dhcrelay_flags			# command option(s)
-# dhcrelay_servers			# dhcrelay server(s)
-# dhcrelay_ifaces			# ethernet interface(s)
-
-dhcrelay_precmd ()
-{
-	local ifaces
-
-	dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf
-
-	if [ -f ${dhcrelay_rcconf} ]; then
-		warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead."
-		. ${dhcrelay_rcconf}
-
-		if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then
-			warn "dhcrelay_options is obsolete, use dhcrelay_flags instead."
-			rc_flags=${dhcrelay_options}
-		fi
-	fi
-
-	if [ -z "${dhcrelay_servers}" ]; then
-		err 1 "no dhcrelay server(s) configured."
-	fi
-
-	ifaces=
-	for iface in ${dhcrelay_ifaces}; do
-		ifaces="${ifaces} -i ${iface}"
-	done
-
-	rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}"
-}
-
-. /etc/rc.subr
-
-name=dhcrelay
-rcvar=${name}_enable
-
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-start_precmd=${name}_precmd
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/isc-dhcp31-server/files/omshell::Makefile.dist b/net/isc-dhcp31-server/files/omshell::Makefile.dist
deleted file mode 100644
index 34c90a2e7f53..000000000000
--- a/net/isc-dhcp31-server/files/omshell::Makefile.dist
+++ /dev/null
@@ -1,80 +0,0 @@
-# Makefile.dist
-#
-# Copyright (c) 1996-2002 Internet Software Consortium.
-# Use is subject to license terms which appear in the file named
-# ISC-LICENSE that should have accompanied this file when you
-# received it.   If a file named ISC-LICENSE did not accompany this
-# file, or you are not sure the one you have is correct, you may
-# obtain an applicable copy of the license at:
-#
-#             http://www.isc.org/isc-license-1.0.html. 
-#
-# This file is part of the ISC DHCP distribution.   The documentation
-# associated with this file is listed in the file DOCUMENTATION,
-# included in the top-level directory of this release.
-#
-# Support and other services are available for ISC products - see
-# http://www.isc.org for more information.
-#
-
-CATMANPAGES = omshell.cat1
-SEDMANPAGES = omshell.man1
-SRCS   = omshell.c
-OBJS   = omshell.o
-PROG   = omshell
-MAN    = omshell.1
-
-INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes
-CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
-DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
-		../omapip/libomapi.a ../dst/libdst.a
-
-all:	$(PROG) $(CATMANPAGES)
-
-$(PROG):	$(OBJS) $(DHCPCTLLIBS)
-	$(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS)
-
-install: all $(CATMANPAGES)
-	for dir in $(USRMANDIR) $(USERBINDIR); do \
-	  foo=""; \
-	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-	    foo=$${foo}/$$bar; \
-	    if [ ! -d $$foo ]; then \
-	      mkdir $$foo; \
-	      chmod 755 $$foo; \
-	    fi; \
-	  done; \
-	done
-	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
-	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
-	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
-				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
-
-depend:
-	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
-
-clean:
-	-rm -f $(OBJS)
-
-realclean: clean
-	-rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #*
-
-distclean: realclean
-	-rm -f Makefile
-
-links:
-	@for foo in $(SRCS) $(MAN); do \
-	  if [ ! -b $$foo ]; then \
-	    rm -f $$foo; \
-	  fi; \
-	  ln -s $(TOP)/omshell/$$foo $$foo; \
-	done
-
-omshell.cat1:	omshell.man1
-	nroff -man omshell.man1 >omshell.cat1
-
-omshell.man1:	omshell.1
-	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
-
-# Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp31-server/files/patch-Makefile b/net/isc-dhcp31-server/files/patch-Makefile
deleted file mode 100644
index 7a8df08b137b..000000000000
--- a/net/isc-dhcp31-server/files/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
---- Makefile.orig	Fri Nov  8 00:10:07 2002
-+++ Makefile	Mon Apr 28 15:04:50 2003
-@@ -38,59 +38,59 @@
- # ``http://www.nominum.com''.
- #
- 
--all:
-+all all.devel all.server all.relay all.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make all); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--install:
-+install install.devel install.server install.relay install.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make install); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--depend:
-+depend depend.devel depend.server depend.relay depend.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make depend); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--clean:
-+clean clean.devel clean.server clean.relay clean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make clean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--realclean:
-+realclean realclean.devel realclean.server realclean.relay realclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make realclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--distclean:
-+distclean distclean.devel distclean.server distclean.relay distclean.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make distclean); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
--links:
-+links links.devel links.server links.relay links.client:
- 	@sysname=`./configure --print-sysname`; \
- 	 if [ ! -d work.$$sysname ]; then \
- 	   echo No build directory for $$sysname - please run ./configure.; \
- 	else \
--	   (cd work.$$sysname; make links); \
-+	   (cd work.$$sysname; make $@); \
- 	fi
- 
diff --git a/net/isc-dhcp31-server/files/patch-Makefile.dist b/net/isc-dhcp31-server/files/patch-Makefile.dist
deleted file mode 100644
index 0c09997023cc..000000000000
--- a/net/isc-dhcp31-server/files/patch-Makefile.dist
+++ /dev/null
@@ -1,226 +0,0 @@
---- Makefile.dist.orig	Fri Nov  8 00:10:08 2002
-+++ Makefile.dist	Tue Apr 29 00:07:43 2003
-@@ -17,47 +17,200 @@
- # http://www.isc.org for more information.
- #
- 
--SUBDIRS=	common $(MINIRES) dst omapip server client relay dhcpctl
-+COMMON_SUBDIRS=	common
-+DEVEL_SUBDIRS=	$(MINIRES) dst omapip dhcpctl
-+SERVER_SUBDIRS=	omshell server
-+RELAY_SUBDIRS=	relay
-+CLIENT_SUBDIRS=	client
-+
-+DEVEL_BUILD_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_BUILD_SUBDIRS=	${SERVER_SUBDIRS}
-+RELAY_BUILD_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_BUILD_SUBDIRS=	${CLIENT_SUBDIRS}
-+
-+DEVEL_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${DEVEL_SUBDIRS}
-+SERVER_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${SERVER_SUBDIRS}
-+RELAY_INSTALL_SUBDIRS=	${RELAY_SUBDIRS}
-+CLIENT_INSTALL_SUBDIRS=	${COMMON_SUBDIRS} ${CLIENT_SUBDIRS}
- 
--all:
--	@for dir in ${SUBDIRS}; do \
-+all: all.server all.relay all.client
-+
-+all.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.server: all.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.relay: all.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making all in $$dir"; \
-+		(cd $$dir; $(MAKE) all) || exit 1; \
-+	done
-+
-+all.client: all.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making all in $$dir"; \
- 		(cd $$dir; $(MAKE) all) || exit 1; \
--	 done
-+	done
-+
-+install: install.devel install.server install.relay install.client
-+
-+install.devel:
-+	@for dir in ${DEVEL_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
- 
--install:
--	@for dir in ${SUBDIRS}; do \
-+install.server:
-+	@for dir in ${SERVER_INSTALL_SUBDIRS}; do \
- 		echo "Installing in $$dir"; \
- 		(cd $$dir; $(MAKE) install) || exit 1; \
--	 done
-+	done
- 
--depend:
--	@for dir in ${SUBDIRS}; do \
-+install.relay:
-+	@for dir in ${RELAY_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+install.client:
-+	@for dir in ${CLIENT_INSTALL_SUBDIRS}; do \
-+		echo "Installing in $$dir"; \
-+		(cd $$dir; $(MAKE) install) || exit 1; \
-+	done
-+
-+depend: depend.server depend.relay depend.client
-+
-+depend.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.server: depend.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+depend.relay: depend.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
- 		echo "Making dependencies in $$dir"; \
- 		(cd $$dir; $(MAKE) depend) || exit 1; \
--	 done
-+	done
-+
-+depend.client: depend.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Making dependencies in $$dir"; \
-+		(cd $$dir; $(MAKE) depend) || exit 1; \
-+	done
-+
-+clean: clean.server clean.relay clean.client
-+
-+clean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.server: clean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
-+
-+clean.relay: clean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) clean) || exit 1; \
-+	done
- 
--clean:
--	@for dir in ${SUBDIRS}; do \
-+clean.client: clean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) clean) || exit 1; \
--	 done
-+	done
-+
-+realclean: realclean.server realclean.relay realclean.client
-+
-+realclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
- 
--realclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.server: realclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
- 		echo "Really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) realclean) || exit 1; \
--	 done
-+	done
- 
--distclean:
--	@for dir in ${SUBDIRS}; do \
-+realclean.relay: realclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+realclean.client: realclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) realclean) || exit 1; \
-+	done
-+
-+distclean: distclean.server distclean.relay distclean.client
-+
-+distclean.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
- 		echo "Really, really cleaning in $$dir"; \
- 		(cd $$dir; $(MAKE) distclean) || exit 1; \
--	 done
--	@rm -f Makefile
-+	done
-+
-+distclean.server: distclean.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.relay: distclean.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+distclean.client: distclean.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
-+		echo "Really, really cleaning in $$dir"; \
-+		(cd $$dir; $(MAKE) distclean) || exit 1; \
-+	done
-+
-+links: links.server links.relay links.client
-+
-+links.devel:
-+	@for dir in ${DEVEL_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.server: links.devel
-+	@for dir in ${SERVER_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
-+
-+links.relay: links.devel
-+	@for dir in ${RELAY_BUILD_SUBDIRS}; do \
-+		echo "Making links in $$dir"; \
-+		(cd $$dir; $(MAKE) links) || exit 1; \
-+	done
- 
--links:
--	@for dir in ${SUBDIRS}; do \
-+links.client: links.devel
-+	@for dir in ${CLIENT_BUILD_SUBDIRS}; do \
- 		echo "Making links in $$dir"; \
- 		(cd $$dir; $(MAKE) links) || exit 1; \
--	 done
-+	done
diff --git a/net/isc-dhcp31-server/files/patch-client::clparse.c b/net/isc-dhcp31-server/files/patch-client::clparse.c
deleted file mode 100644
index 875f61f53b39..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::clparse.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/clparse.c.orig	Sat May  6 17:42:49 2006
-+++ client/clparse.c	Sat May  6 17:43:12 2006
-@@ -777,7 +777,7 @@
- 			interface_dereference(&ip, MDL);
- 			return 0;
- 		}
--		strcpy(ip->name, name);
-+		strlcpy (ip -> name, name, IFNAMSIZ);
- 
- 		if (dummy_interfaces) {
- 			interface_reference (&ip -> next,
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.8 b/net/isc-dhcp31-server/files/patch-client::dhclient.8
deleted file mode 100644
index 3f5cfe64497b..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.8
+++ /dev/null
@@ -1,84 +0,0 @@
---- client/dhclient.8.orig	Wed Sep 14 18:03:33 2005
-+++ client/dhclient.8	Sat May  6 17:30:28 2006
-@@ -23,6 +23,10 @@
- .\"
- .\" $Id: dhclient.8,v 1.12.2.11 2005/09/14 16:03:33 dhankins Exp $
- .\"
-+.\" Portions copyright (c) 2000 David E. O'Brien.
-+.\" All rights reserved.
-+.\" $FreeBSD$
-+.\"
- .TH dhclient 8
- .SH NAME
- dhclient - Dynamic Host Configuration Protocol Client
-@@ -33,6 +37,9 @@
- .I port
- ]
- [
-+.B -D
-+]
-+[
- .B -d
- ]
- [
-@@ -43,6 +50,9 @@
- .B -q
- ]
- [
-+.B -v
-+]
-+[
- .B -1
- ]
- [
-@@ -73,6 +83,10 @@
- relay
- ]
- [
-+.B -i
-+interval
-+]
-+[
- .B -n
- ]
- [
-@@ -157,6 +171,15 @@
- configuration file or on the command line, and will ignore all other
- interfaces.
- .PP
-+The
-+.B -D
-+flag causes
-+.B dhclient
-+to save the script it creates for use in conjunction with
-+.B dhclient-script
-+in
-+.IR /tmp.
-+.PP
- If the DHCP client should listen and transmit on a port other than the
- standard (port 68), the
- .B -p
-@@ -180,6 +203,12 @@
- flag, followed by the IP address to send.   This is only useful for testing,
- and should not be expected to work in any consistent or useful way.
- .PP
-+On FreeBSD, dhclient can be enabled to automatically handle the
-+link status of the network card. Normally polling is done every
-+five seconds. The polling interval can be set using the
-+.B -i
-+flag, followed by the numbers of seconds. Minimum is one second.
-+.PP
- The DHCP client will normally run in the foreground until it has
- configured an interface, and then will revert to running in the
- background.   To run force dhclient to always run as a foreground
-@@ -206,6 +235,10 @@
- .B -q
- flag prevents any messages other than errors from being printed to the
- standard error descriptor.
-+.B -v
-+flag turns on all messages.
-+Opposite of
-+.B -q .
- .PP
- The client normally doesn't release the current lease as it is not
- required by the DHCP protocol.  Some cable ISPs require their clients
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.c b/net/isc-dhcp31-server/files/patch-client::dhclient.c
deleted file mode 100644
index d8a4e0beaf41..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.c
+++ /dev/null
@@ -1,545 +0,0 @@
---- client/dhclient.c.orig	2008-01-23 06:02:50.000000000 +1100
-+++ client/dhclient.c	2008-10-13 22:47:51.000000000 +1100
-@@ -38,6 +38,13 @@
- #include "dhcpd.h"
- #include "version.h"
- 
-+#if __FreeBSD_version > 502010
-+#include <sys/ioctl.h>
-+#include <net/if_media.h>
-+#include <net80211/ieee80211_ioctl.h>
-+#include <net80211/ieee80211.h>
-+#endif
-+
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
- 
-@@ -72,8 +79,11 @@
- struct string_list *client_env=NULL;
- int client_env_count=0;
- int onetry=0;
--int quiet=0;
-+int quiet=1;
- int nowait=0;
-+#ifdef ENABLE_POLLING_MODE
-+int polling_interval = 5;
-+#endif
- 
- static void usage PROTO ((void));
- 
-@@ -181,6 +191,9 @@
- 		} else if (!strcmp (argv [i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
-+		} else if (!strcmp (argv [i], "-v")) {
-+			quiet = 0;
-+			quiet_interface_discovery = 0;
- 		} else if (!strcmp (argv [i], "-s")) {
- 			if (++i == argc)
- 				usage ();
-@@ -194,6 +207,19 @@
- 		} else if (!strcmp (argv [i], "-n")) {
- 			/* do not start up any interfaces */
- 			interfaces_requested = 1;
-+#ifdef ENABLE_POLLING_MODE
-+		} else if (!strcmp (argv [i], "-i")) {
-+			if (++i == argc)
-+				usage ();
-+			polling_interval = (int)strtol (argv [i],
-+			    (char **)NULL, 10);
-+			if (polling_interval <= 0) {
-+				log_info ("Incorrect polling interval %d",
-+				    polling_interval);
-+				log_info ("Using a default of 5 seconds");
-+				polling_interval = 5;
-+			}
-+#endif
- 		} else if (!strcmp (argv [i], "-w")) {
- 			/* do not exit if there are no broadcast interfaces. */
- 			persist = 1;
-@@ -222,7 +248,16 @@
- 		    if (strlen(argv[i]) >= sizeof(tmp->name))
- 			    log_fatal("%s: interface name too long (is %ld)",
- 				       argv [i], (long)strlen(argv[i]));
--		    strcpy(tmp->name, argv[i]);
-+		    strlcpy (tmp -> name, argv [i], IFNAMSIZ);
-+#if __FreeBSD_version > 502010
-+		    set_ieee80211 (tmp);
-+#endif
-+		    /* Init some interface vars, enable polling */
-+#ifdef ENABLE_POLLING_MODE
-+		    tmp -> forcediscover = 0;
-+		    tmp -> linkstate = HAVELINK;
-+		    tmp -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 		    if (interfaces) {
- 			    interface_reference (&tmp -> next,
- 						 interfaces, MDL);
-@@ -380,6 +415,16 @@
- 					     INTERFACE_AUTOMATIC)) !=
- 			     INTERFACE_REQUESTED))
- 				continue;
-+#if __FreeBSD_version > 502010
-+			set_ieee80211 (ip);
-+#endif
-+#ifdef ENABLE_POLLING_MODE
-+			ip -> forcediscover = 0;
-+			if (ip -> client -> config -> media != NULL)
-+				ip -> havemedia = 1;
-+			else
-+				ip -> havemedia = 0;
-+#endif
- 			script_init (ip -> client,
- 				     "PREINIT", (struct string_list *)0);
- 			if (ip -> client -> alias)
-@@ -424,8 +469,13 @@
- 				client -> state = S_INIT;
- 				/* Set up a timeout to start the initialization
- 				   process. */
-+#ifdef ENABLE_POLLING_MODE
-+				add_timeout (cur_time + random () % 5 + 2,
-+					     state_polling, client, 0, 0);
-+#else
- 				add_timeout (cur_time + random () % 5,
- 					     state_reboot, client, 0, 0);
-+#endif
- 			}
- 		}
- 	}
-@@ -483,9 +533,10 @@
- 	log_info (arr);
- 	log_info (url);
- 
--	log_error ("Usage: dhclient [-1dqrx] [-nw] [-p <port>] %s",
-+	log_error ("Usage: dhclient [-1dqrvx] [-i polling-interval] %s",\
-+		   "[-nw] [-p <port>] %s",
- 		   "[-s server]");
--	log_error ("                [-cf config-file] [-lf lease-file]%s",
-+	log_error ("                [-cf config-file] [-lf lease-file] %s",
- 		   "[-pf pid-file] [-e VAR=val]");
- 	log_fatal ("                [-sf script-file] [interface]");
- }
-@@ -886,6 +937,15 @@
- 	/* Write out the new lease. */
- 	write_client_lease (client, client -> new, 0, 0);
- 
-+	/*
-+	 * It's now possible that state_reboot can be called
-+	 * after a interface link went down and is up again.
-+	 * To prevent tons of equal leases saved on disk, we rewrite
-+	 * them.
-+	 */
-+	read_client_leases ();
-+	rewrite_client_leases ();
-+ 
- 	/* Replace the old active lease with the new one. */
- 	if (client -> active)
- 		destroy_client_lease (client -> active);
-@@ -900,6 +960,12 @@
- 	      piaddr (client -> active -> address),
- 	      (long)(client -> active -> renewal - cur_time));
- 	client -> state = S_BOUND;
-+#ifdef ENABLE_POLLING_MODE
-+	/* Init some interface vars, enable polling */
-+	client -> interface -> linkstate = HAVELINK;
-+	client -> interface -> forcediscover = 0;
-+	client -> interface -> polling = 1;
-+#endif /* ifdef ENABLE_POLLING_MODE */
- 	reinitialize_interfaces ();
- 	go_daemon ();
- 	if (client -> config -> do_forward_update) {
-@@ -1422,6 +1488,11 @@
- 	int interval;
- 	int increase = 1;
- 
-+#ifdef ENABLE_POLLING_MODE
-+	/* Disable polling for this interface */
-+	client -> interface -> polling = 0;
-+#endif
-+
- 	/* Figure out how long it's been since we started transmitting. */
- 	interval = cur_time - client -> first_sending;
- 
-@@ -1522,6 +1593,9 @@
- 	struct client_lease *loop;
- 	struct client_lease *lp;
- 
-+	if (client -> interface -> linkstate == NOLINK)
-+		return;
-+
- 	loop = lp = client -> active;
- 
- 	log_info ("No DHCPOFFERS received.");
-@@ -1554,6 +1628,10 @@
- 				log_info ("bound: renewal in %ld %s.",
- 					  (long)(client -> active -> renewal -
- 						 cur_time), "seconds");
-+#ifdef ENABLE_POLLING_MODE
-+				/* Enable polling for this interface */
-+				client -> interface -> polling = 1;
-+#endif
- 				add_timeout (client -> active -> renewal,
- 					     state_bound, client, 0, 0);
- 			    } else {
-@@ -1561,6 +1639,11 @@
- 				log_info ("bound: immediate renewal.");
- 				state_bound (client);
- 			    }
-+			    /*
-+			     * Set the link status back to nolink, even
-+			     * if we have media settings.
-+			     */
-+                            client -> interface -> linkstate = NOLINK;
- 			    reinitialize_interfaces ();
- 			    go_daemon ();
- 			    return;
-@@ -1606,6 +1689,12 @@
- 	}
- 
- 	log_info ("No working leases in persistent database - sleeping.");
-+
-+#ifdef ENABLE_POLLING_MODE
-+	/* Enable polling for this interface */
-+	client -> interface -> polling = 1;
-+#endif
-+
- 	script_init (client, "FAIL", (struct string_list *)0);
- 	if (client -> alias)
- 		script_write_params (client, "alias_", client -> alias);
-@@ -1747,6 +1836,18 @@
- 			client -> packet.secs = htons (65535);
- 	}
- 
-+	/*
-+	 * Only try the first ten seconds to renew a lease from a
-+	 * given dhcp-server adress. After that, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time &&
-+			interval >= 10)
-+			goto cancel;
-+	}
-+
- 	log_info ("DHCPREQUEST on %s to %s port %d",
- 	      client -> name ? client -> name : client -> interface -> name,
- 	      inet_ntoa (destination.sin_addr),
-@@ -1768,6 +1869,16 @@
- 				      from, &destination,
- 				      (struct hardware *)0);
- 
-+	/*
-+	 * If sendto() for a direct request fails, fall back to use
-+	 * state_reboot with INADDR_BROADCAST.
-+	 */
-+	if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST &&
-+	   (client -> state == S_RENEWING || client -> state == S_REBINDING)) {
-+		if (client -> active && client -> active -> expiry > cur_time)
-+			goto cancel;
-+	}
-+
- 	add_timeout (cur_time + client -> interval,
- 		     send_request, client, 0, 0);
- }
-@@ -2654,6 +2765,13 @@
- 			wstatus = 0;
- 		}
- 	} else {
-+		if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) {
-+			dup2(i, STDIN_FILENO);
-+			dup2(i, STDOUT_FILENO);
-+			dup2(i, STDERR_FILENO);
-+			if (i > STDERR_FILENO)
-+				close(i);
-+		}
- 		/* We don't want to pass an open file descriptor for
- 		 * dhclient.leases when executing dhclient-script.
- 		 */
-@@ -2840,8 +2958,10 @@
- 			      case S_STOPPED:
- 				break;
- 			}
-+#ifndef ENABLE_POLLING_MODE
- 			client -> state = S_INIT;
- 			state_reboot (client);
-+#endif
- 		}
- 	}
- }
-@@ -3069,7 +3189,9 @@
- 		    break;
- 
- 		  case server_awaken:
-+#ifndef ENABLE_POLLING_MODE
- 		    state_reboot (client);
-+#endif
- 		    break;
- 		}
- 	    }
-@@ -3207,3 +3329,265 @@
- 	data_string_forget (&ddns_dhcid, MDL);
- 	return rcode;
- }
-+ 
-+/* Check to see if there's a wire plugged in */
-+int
-+interface_active(struct interface_info *ip) {
-+#if __FreeBSD_version > 502010
-+	struct ifmediareq ifmr;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ifmr, 0, sizeof (ifmr));
-+	(void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name));
-+ 
-+	if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+		/*
-+		 * Interface doesn't support SIOCGIFMEDIA, presume okay
-+		 */
-+		close (sock);
-+		return (HAVELINK);
-+	}
-+	close (sock);
-+ 
-+	if (ifmr.ifm_count == 0) {
-+		/*
-+		 * Assume that this means interface
-+		 * does not support SIOCGIFMEDIA
-+		 */
-+		log_fatal ("%s: no media types?", ifname);
-+		return (HAVELINK);
-+	}
-+ 
-+	if (ifmr.ifm_status & IFM_AVALID) {
-+		if (ip -> ieee80211) {
-+			/*
-+			 * Wavelan devices need to be checked if they are
-+			 * associated.
-+			 */
-+			if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
-+			     (ifmr.ifm_status & IFM_ACTIVE)) {
-+				return (HAVELINK);
-+			}
-+		} else {
-+			if (ifmr.ifm_status & IFM_ACTIVE) {
-+				return (HAVELINK);
-+			}
-+		}
-+		/*
-+		 * We really have no link.
-+		 */
-+		return (NOLINK);
-+	}
-+	/*
-+	 * IFM_AVALID is not set. We cannot check
-+	 * the link state. Assume HAVELINK.
-+	 */
-+ 
-+#endif /* Other OSs */
-+	/*
-+	 * Always return a successful link if the OS
-+	 * is not supported.
-+	 */
-+	return (HAVELINK);
-+}
-+ 
-+#if __FreeBSD_version > 502010
-+void
-+set_ieee80211 (struct interface_info *ip) {
-+ 
-+	struct ieee80211req     ireq;
-+	u_int8_t                data[32];
-+	int                     associated = 0;
-+	int *media_list, i;
-+	char *ifname;
-+	int sock;
-+ 
-+	ifname = ip -> name;
-+ 
-+	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-+		log_fatal ("Can't create interface_active socket");
-+ 
-+	(void) memset (&ireq, 0, sizeof (ireq));
-+	(void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name));
-+	ireq.i_data = &data;
-+	ireq.i_type = IEEE80211_IOC_SSID;
-+	ireq.i_val = -1;
-+	/*
-+	 * If we can't get the SSID,
-+	 * this isn't an 802.11 device.
-+	 */
-+	if (ioctl (sock, SIOCG80211, &ireq) < 0)
-+		ip -> ieee80211 = 0;
-+	else {
-+#ifdef DEBUG
-+		printf ("Device %s has 802.11\n", ifname);
-+#endif
-+		ip -> ieee80211 = 1;
-+	}
-+	close (sock);
-+ }
-+#endif /* __FreeBSD_version */
-+ 
-+#ifdef ENABLE_POLLING_MODE
-+/* Go to background after some time */
-+void state_background (cpp)
-+	void *cpp;
-+{
-+	go_daemon ();
-+}
-+
-+/* Check the state of the NICs if we have link */
-+void state_polling (cpp)
-+	 void *cpp;
-+{
-+	static int doinitcheck = 0;
-+	struct interface_info *ip;
-+	struct client_state *client;
-+	int result;
-+ 
-+	for (ip = interfaces; ip; ip = ip -> next) {
-+		if (! ip -> polling)
-+			continue;
-+#ifdef DEBUG
-+		printf ("%s: Polling interface state\n", ip -> name);
-+		for (client = ip -> client;
-+		     client; client = client -> next) {
-+			printf ("%s: client state of %d\n", ip -> name, ip -> client -> state);
-+			printf ("%s: link = %d\n", ip -> name, ip -> linkstate);
-+		}
-+#endif
-+ 
-+		result = interface_active (ip);
-+		/*
-+		 * If dhclient.conf contains media settings, we cannot
-+		 * abort if the interface is not set to active mode.
-+		 */
-+		if (ip -> havemedia && ip -> client -> state != S_BOUND) {
-+			if (result == HAVELINK)
-+				ip -> forcediscover = 1;
-+			result = HAVELINK;
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we've got no link ...
-+		 */
-+		if (ip -> linkstate == NOLINK || ! doinitcheck) {
-+			/*
-+			 * ... but we have now link. Let's send
-+			 * requests.
-+			 */
-+			if (result == HAVELINK) {
-+#ifdef DEBUG
-+				if (ip -> havemedia)
-+					printf ("%s: Trying media settings on interface\n",
-+						ip -> name);
-+				else
-+					printf ("%s: Found Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * Set the interface to state_bound. We assume that we have
-+				 * a working link. If we cannot reach the server directly,
-+				 * INADDR_BROADCAST is used.
-+				 */
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					cancel_timeout (state_init, client);
-+					cancel_timeout (state_reboot, client);
-+					cancel_timeout (state_selecting, client);
-+					if (client -> active) {
-+						add_timeout (cur_time + random () % 5,
-+						   state_bound, client, 0, 0);
-+					} else {
-+						add_timeout (cur_time + random () % 5,
-+						   state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = HAVELINK;
-+			} else {
-+#ifdef DEBUG
-+				printf ("%s: No link on interface\n", ip -> name);
-+#endif
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					/*
-+					 * Without this add_timout(), dhclient does
-+					 * not poll on a interface if there
-+					 * is no cable plugged in at startup
-+					 * time. Because we add one additional second
-+					 * to the time of a normal timeout, we always
-+					 * skip and block a running one. This prevents
-+					 * that polling is done twice at the same time.
-+					 */
-+					if (client -> state == S_INIT) {
-+						add_timeout (cur_time + (polling_interval + 1),
-+							     state_polling, client, 0, 0);
-+					}
-+				}
-+				ip -> linkstate = NOLINK;
-+				/*
-+				 * Automatically go into the background after
-+				 * some time. Do this only if there are no
-+				 * media options available for a interface.
-+				 */
-+				if (! ip -> havemedia && ! doinitcheck) {
-+					add_timeout (cur_time + (polling_interval * 2),
-+						    state_background, client, 0, 0);
-+				}
-+			}
-+		}
-+ 
-+		/*
-+		 * The last status of the interface tells us
-+		 * the we previously had link.
-+		 */
-+		if (ip -> linkstate == HAVELINK && doinitcheck) {
-+			if (result == NOLINK) {
-+				/*
-+				 * We lost link on the interface, or it isn't
-+				 * associated anymore.
-+				 */
-+#ifdef DEBUG
-+				printf ("%s: Lost Link on interface\n", ip -> name);
-+#endif
-+				/*
-+				 * After we lost link, cycle again through the
-+				 * different media settings if available. Else
-+				 * set NOLINK.
-+				 */
-+				if (ip -> havemedia)
-+					ip -> forcediscover = 1;
-+				else
-+					ip -> linkstate = NOLINK;
-+			}
-+			/*
-+			 * If we happen to have a real link, but no
-+			 * active lease, force the interface into
-+			 * state_reboot. Do the same if media settings
-+			 * are available.
-+			 */
-+			if (ip -> forcediscover) {
-+				for (client = ip -> client;
-+				     client; client = client -> next) {
-+					if (client -> state != S_REBOOTING &&
-+					    client -> state != S_SELECTING) {
-+						add_timeout (cur_time + random () % 5,
-+							    state_reboot, client, 0, 0);
-+					}
-+				}
-+				ip -> forcediscover = 0;
-+				ip -> linkstate = HAVELINK;
-+			}
-+			/* We still have link, do nothing. */
-+		}
-+	}
-+	doinitcheck = 1;
-+}
-+#endif /* ifdef ENABLE_POLLING_MODE */
diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.conf b/net/isc-dhcp31-server/files/patch-client::dhclient.conf
deleted file mode 100644
index 2d9560f43bf8..000000000000
--- a/net/isc-dhcp31-server/files/patch-client::dhclient.conf
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/dhclient.conf.orig	Tue Jun  3 00:50:44 1997
-+++ client/dhclient.conf	Wed Mar  3 02:20:41 2004
-@@ -11,7 +11,7 @@
- reboot 10;
- select-timeout 5;
- initial-interval 2;
--script "/etc/dhclient-script";
-+script "%%PREFIX%%/sbin/dhclient-script";
- media "-link0 -link1 -link2", "link0 link1";
- reject 192.33.137.209;
- 
diff --git a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp31-server/files/patch-common::dhcp-options.5
deleted file mode 100644
index 9d936cfffeee..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5
+++ /dev/null
@@ -1,32 +0,0 @@
---- common/dhcp-options.5.orig	Sun Feb 23 04:27:42 2003
-+++ common/dhcp-options.5	Wed Mar  3 02:12:13 2004
-@@ -431,7 +431,10 @@
- the domain-name option to specify the domain name).  See RFC 1035 for
- character set restrictions.  This option is only honored by
- .B dhclient-script(8)
--if the hostname for the client machine is not set.
-+if the hostname for the client machine is not set (i.e., set to the empty
-+string in
-+.B rc.conf(5)
-+).
- .RE
- .PP
- .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR
-@@ -654,7 +657,7 @@
- This option specifies whether the client should configure its IP
- layer to allow forwarding of datagrams with non-local source routes
- (see Section 3.3.5 of [4] for a discussion of this topic).  A value
--of false means disallow forwarding of such datagrams, and a value of true
-+of 0 means disallow forwarding of such datagrams, and a value of true
- means allow forwarding.
- .RE
- .PP
-@@ -948,7 +951,7 @@
- .PP
- This option specifies whether or not the client should negotiate the
- use of trailers (RFC 893 [14]) when using the ARP protocol.  A value
--of false indicates that the client should not attempt to use trailers.  A
-+of 0 indicates that the client should not attempt to use trailers.  A
- value of true means that the client should attempt to use trailers.
- .RE
- .PP
diff --git a/net/isc-dhcp31-server/files/patch-common::discover.c b/net/isc-dhcp31-server/files/patch-common::discover.c
deleted file mode 100644
index 1cfcc2094098..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::discover.c
+++ /dev/null
@@ -1,238 +0,0 @@
---- common/discover.c.orig	Fri Jul 25 21:44:15 2003
-+++ common/discover.c	Fri Mar  5 23:33:04 2004
-@@ -47,6 +47,7 @@
- #endif /* not lint */
- 
- #include "dhcpd.h"
-+#include <ifaddrs.h>
- #include <sys/ioctl.h>
- 
- struct interface_info *interfaces, *dummy_interfaces, *fallback_interface;
-@@ -135,10 +136,7 @@
- {
- 	struct interface_info *tmp, *ip;
- 	struct interface_info *last, *next;
--	char buf [2048];
--	struct ifconf ic;
--	struct ifreq ifr;
--	int i;
-+	struct ifaddrs *ifap, *ifa;
- 	int sock;
- 	int address_count = 0;
- 	struct subnet *subnet;
-@@ -157,61 +155,6 @@
- 	if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- 		log_fatal ("Can't create addrlist socket");
- 
--	/* Get the interface configuration information... */
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* linux will only tell us how long a buffer it wants if we give it
--	 * a null buffer first. So, do a dry run to figure out the length.
--	 * 
--	 * XXX this code is duplicated from below because trying to fold
--	 * the logic into the if statement and goto resulted in excesssive
--	 * obfuscation. The intent is that unless you run Linux you shouldn't
--	 * have to deal with this. */
--
--	ic.ifc_len = 0;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL;
--#else
--	/* otherwise, we just feed it a starting size, and it'll tell us if
--	 * it needs more */
--
--	ic.ifc_len = sizeof buf;
--	ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--#endif
--
--      gifconf_again:
--	i = ioctl(sock, SIOCGIFCONF, &ic);
--
--	if (i < 0)
--		log_fatal ("ioctl: SIOCGIFCONF: %m");
--
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	/* Workaround for SIOCGIFCONF bug on some Linux versions. */
--	if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) {
--		ic.ifc_len = sizeof buf;
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		goto gifconf_again;
--	}
--#endif
--
--	/* If the SIOCGIFCONF resulted in more data than would fit in
--	   a buffer, allocate a bigger buffer. */
--	if ((ic.ifc_ifcu.ifcu_buf == buf 
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	     || ic.ifc_ifcu.ifcu_buf == 0
--#endif
--		) && ic.ifc_len > sizeof buf) {
--		ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL);
--		if (!ic.ifc_ifcu.ifcu_buf)
--			log_fatal ("Can't allocate SIOCGIFCONF buffer.");
--		goto gifconf_again;
--#ifdef SIOCGIFCONF_ZERO_PROBE
--	} else if (ic.ifc_ifcu.ifcu_buf == 0) {
--		ic.ifc_ifcu.ifcu_buf = (caddr_t)buf;
--		ic.ifc_len = sizeof buf;
--		goto gifconf_again;
--#endif
--	}
--
- 		
- 	/* If we already have a list of interfaces, and we're running as
- 	   a DHCP server, the interfaces were requested. */
-@@ -224,51 +167,38 @@
- 	else
- 		ir = INTERFACE_REQUESTED;
- 
-+	if (getifaddrs(&ifap) != 0)
-+		log_fatal ("getifaddrs failed");
-+
- 	/* Cycle through the list of interfaces looking for IP addresses. */
--	for (i = 0; i < ic.ifc_len;) {
--		struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i);
--#ifdef HAVE_SA_LEN
--		if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr))
--			i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len;
--		else
--#endif
--			i += sizeof *ifp;
-+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- 
- #ifdef ALIAS_NAMES_PERMUTED
--		if ((s = strrchr (ifp -> ifr_name, ':'))) {
-+		if ((s = strrchr (ifa -> ifa_name, ':'))) {
- 			*s = 0;
- 		}
- #endif
- 
- #ifdef SKIP_DUMMY_INTERFACES
--		if (!strncmp (ifp -> ifr_name, "dummy", 5))
-+		if (!strncmp (ifa -> ifa_name, "dummy", 5))
- 			continue;
- #endif
- 
--
--		/* See if this is the sort of interface we want to
--		   deal with. */
--		strcpy (ifr.ifr_name, ifp -> ifr_name);
--		if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0)
--			log_fatal ("Can't get interface flags for %s: %m",
--			       ifr.ifr_name);
--
- 		/* See if we've seen an interface that matches this one. */
- 		for (tmp = interfaces; tmp; tmp = tmp -> next)
--			if (!strcmp (tmp -> name, ifp -> ifr_name))
-+			if (!strcmp (tmp -> name, ifa -> ifa_name))
- 				break;
- 
--		/* Skip non broadcast interfaces (plus loopback and
--		   point-to-point in case an OS incorrectly marks them
--		   as broadcast). Also skip down interfaces unless we're
-+		/* See if this is the sort of interface we want to
-+		   deal with.  Skip loopback, point-to-point and down
-+		   interfaces, except don't skip down interfaces if we're
- 		   trying to get a list of configurable interfaces. */
--		if (((!(ifr.ifr_flags & IFF_BROADCAST) ||
--		      ifr.ifr_flags & IFF_LOOPBACK ||
--		      ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) ||
--		    (!(ifr.ifr_flags & IFF_UP) &&
-+		if ((ifa->ifa_flags & IFF_LOOPBACK) ||
-+		     (ifa->ifa_flags & IFF_POINTOPOINT) ||
-+		     (!(ifa->ifa_flags & IFF_UP) &&
- 		     state != DISCOVER_UNCONFIGURED))
- 			continue;
--		
-+
- 		/* If there isn't already an interface by this name,
- 		   allocate one. */
- 		if (!tmp) {
-@@ -276,9 +206,9 @@
- 			status = interface_allocate (&tmp, MDL);
- 			if (status != ISC_R_SUCCESS)
- 				log_fatal ("Error allocating interface %s: %s",
--					   ifp -> ifr_name,
-+					   ifa -> ifa_name,
- 					   isc_result_totext (status));
--			strcpy (tmp -> name, ifp -> ifr_name);
-+			strcpy (tmp -> name, ifa -> ifa_name);
- 			interface_snorf (tmp, ir);
- 			interface_dereference (&tmp, MDL);
- 			tmp = interfaces; /* XXX */
-@@ -290,9 +220,9 @@
- 		/* If we have the capability, extract link information
- 		   and record it in a linked list. */
- #ifdef HAVE_AF_LINK
--		if (ifp -> ifr_addr.sa_family == AF_LINK) {
-+		if (ifa -> ifa_addr->sa_family == AF_LINK) {
- 			struct sockaddr_dl *foo = ((struct sockaddr_dl *)
--						   (&ifp -> ifr_addr));
-+						   (ifa -> ifa_addr));
- #if defined (HAVE_SIN_LEN)
- 			tmp -> hw_address.hlen = foo -> sdl_alen;
- #else
-@@ -305,12 +235,11 @@
- 		} else
- #endif /* AF_LINK */
- 
--		if (ifp -> ifr_addr.sa_family == AF_INET) {
-+		if (ifa -> ifa_addr->sa_family == AF_INET) {
- 			struct iaddr addr;
- 
- 			/* Get a pointer to the address... */
--			memcpy (&foo, &ifp -> ifr_addr,
--				sizeof ifp -> ifr_addr);
-+			bcopy(ifa->ifa_addr, &foo, sizeof(foo));
- 
- 			/* We don't want the loopback interface. */
- 			if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) &&
-@@ -323,16 +252,15 @@
- 			   found, keep a pointer to ifreq structure in
- 			   which we found it. */
- 			if (!tmp -> ifp) {
--#ifdef HAVE_SA_LEN
--				unsigned len = ((sizeof ifp -> ifr_name) +
--						ifp -> ifr_addr.sa_len);
--#else
--				unsigned len = sizeof *ifp;
--#endif
-+
-+				int len = (IFNAMSIZ +
-+					ifa -> ifa_addr->sa_len);
- 				tif = (struct ifreq *)dmalloc (len, MDL);
- 				if (!tif)
- 					log_fatal ("no space for ifp.");
--				memcpy (tif, ifp, len);
-+				strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ);
-+				memcpy(&tif->ifr_addr, ifa->ifa_addr,
-+					ifa->ifa_addr->sa_len);
- 				tmp -> ifp = tif;
- 				tmp -> primary_address = foo.sin_addr;
- 			}
-@@ -346,9 +274,6 @@
- 		}
- 	}
- 
--	/* If we allocated a buffer, free it. */
--	if (ic.ifc_ifcu.ifcu_buf != buf)
--		dfree (ic.ifc_ifcu.ifcu_buf, MDL);
- 
- #if defined (LINUX_SLASHPROC_DISCOVERY)
- 	/* On Linux, interfaces that don't have IP addresses don't
-@@ -529,6 +454,7 @@
- 	   be able to configure, we can quit now. */
- 	if (state == DISCOVER_UNCONFIGURED) {
- 		close (sock);
-+		freeifaddrs(ifap);
- 		return;
- 	}
- 
-@@ -674,6 +600,7 @@
- 	}
- 
- 	close (sock);
-+	freeifaddrs(ifap);
- 
- 	if (state == DISCOVER_SERVER && wifcount == 0) {
- 		log_info ("%s", "");
diff --git a/net/isc-dhcp31-server/files/patch-common::dispatch.c b/net/isc-dhcp31-server/files/patch-common::dispatch.c
deleted file mode 100644
index 0aa709cf0860..000000000000
--- a/net/isc-dhcp31-server/files/patch-common::dispatch.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/dispatch.c.orig	Sun Nov 17 03:26:57 2002
-+++ common/dispatch.c	Wed Mar  3 16:20:15 2004
-@@ -95,11 +95,26 @@
- void dispatch ()
- {
- 	struct timeval tv, *tvp;
-+#ifdef ENABLE_POLLING_MODE
-+	struct timeval *tvp_new;
-+#endif
- 	isc_result_t status;
-+	TIME cur_time;
- 
-+	tvp = NULL;
-+#ifdef ENABLE_POLLING_MODE
-+	tvp_new = NULL;
-+#endif
- 	/* Wait for a packet or a timeout... XXX */
- 	do {
- 		tvp = process_outstanding_timeouts (&tv);
-+#ifdef ENABLE_POLLING_MODE
-+		GET_TIME (&cur_time);
-+		add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0);
-+		tvp_new = process_outstanding_timeouts(&tv);
-+		if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
-+			tvp = tvp_new;
-+#endif /* ENABLE_POLLING_MODE */
- 		status = omapi_one_dispatch (0, tvp);
- 	} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
- 	log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
diff --git a/net/isc-dhcp31-server/files/patch-configure b/net/isc-dhcp31-server/files/patch-configure
deleted file mode 100644
index 5aff6909acce..000000000000
--- a/net/isc-dhcp31-server/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig	Sat Apr 20 23:44:13 2002
-+++ configure	Mon Apr 28 23:02:10 2003
-@@ -13,6 +13,9 @@
-   elif [ x$1 = x--dirs ]; then
-     dirs=$2
-     shift
-+  elif [ x$1 = x--subsys ]; then
-+    subsys=$2
-+    shift
-   elif [ x$1 = x--no-links ]; then
-     nolinks=YES
-   elif [ x$1 = x--copts ]; then
-@@ -233,7 +236,14 @@
- fi
- 
- if [ x"$dirs" = x ]; then
--  dirs=". client server relay common omapip dhcpctl minires dst"
-+  dirs=". common minires dst omapip dhcpctl"
-+  if [ x$subsys = x ]; then
-+    dirs="$dirs server omshell client relay"
-+  elif [ x$subsys = xserver ]; then
-+    dirs="$dirs server omshell"
-+  elif [ x$subsys = xclient -o x$subsys = xrelay ]; then
-+    dirs="$dirs $subsys"
-+  fi
- fi
- 
- for foo in $dirs; do
-@@ -253,7 +263,11 @@
- 
- # Make the link tree in which to actually build.
- if [ x$nolinks = x ]; then
--  make links
-+  if [ x$subsys = x ]; then
-+    make links
-+  else
-+    make links.$subsys
-+  fi
- fi
- 
- exit 0
diff --git a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
deleted file mode 100644
index 6be222452750..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist
+++ /dev/null
@@ -1,81 +0,0 @@
---- dhcpctl/Makefile.dist.orig	2009-10-16 12:57:05.000000000 +0000
-+++ dhcpctl/Makefile.dist	2009-10-16 13:01:01.000000000 +0000
-@@ -22,11 +22,11 @@
- #   https://www.isc.org/
- #
- 
--CATMANPAGES = dhcpctl.cat3 omshell.cat1
--SEDMANPAGES = dhcpctl.man3 omshell.man1
-+CATMANPAGES = dhcpctl.cat3
-+SEDMANPAGES = dhcpctl.man3
- SRC    = dhcpctl.c callback.c remote.c
- OBJ    = dhcpctl.o callback.o remote.o
--MAN    = dhcpctl.3 omshell.1
-+MAN    = dhcpctl.3
- HDRS   = dhcpctl.h
- 
- INCLUDES = $(BINDINC) -I$(TOP)/includes
-@@ -34,10 +34,7 @@
- DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \
- 		../omapip/libomapi.a ../dst/libdst.a
- 
--all:	libdhcpctl.a omshell cltest $(CATMANPAGES)
--
--omshell:	omshell.o $(DHCPCTLLIBS)
--	$(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS)
-+all:	libdhcpctl.a cltest $(CATMANPAGES)
- 
- cltest:	cltest.o $(DHCPCTLLIBS)
- 	$(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS)
-@@ -48,8 +45,7 @@
- 	$(RANLIB) libdhcpctl.a
- 
- install: all $(CATMANPAGES)
--	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \
--		$(USERBINDIR); do \
-+	for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \
- 	  foo=""; \
- 	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
- 	    foo=$${foo}/$$bar; \
-@@ -64,19 +60,14 @@
- 	$(INSTALL) dhcpctl.h $(DESTDIR)$(INCDIR)
- 	$(CHMOD) 644 $(DESTDIR)$(INCDIR)/dhcpctl.h
- 
--	$(INSTALL) omshell $(DESTDIR)$(USERBINDIR)
--	$(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell
--
- 	$(MANINSTALL) $(MANFROM) dhcpctl.$(MANCAT)3 $(MANTO) \
- 				$(DESTDIR)$(LIBMANDIR)/dhcpctl$(LIBMANEXT)
--	$(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \
--				$(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
- 
- clean:
--	-rm -f $(OBJ) omshell.o omshell cltest.o cltest
-+	-rm -f $(OBJ) cltest.o cltest
- 
- realclean: clean
- 	-rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES)
-@@ -85,7 +76,7 @@
- 	-rm -f Makefile
- 
- links:
--	@for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \
-+	@for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \
- 	  if [ ! -b $$foo ]; then \
- 	    rm -f $$foo; \
- 	  fi; \
-@@ -99,11 +90,4 @@
- 	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
- 		-e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
- 
--omshell.cat1:	omshell.man1
--	nroff -man omshell.man1 >omshell.cat1
--
--omshell.man1:	omshell.1
--	sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
--		-e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
--
- # Dependencies (semi-automatically-generated)
diff --git a/net/isc-dhcp31-server/files/patch-dhcpd.conf b/net/isc-dhcp31-server/files/patch-dhcpd.conf
deleted file mode 100644
index 030e89874d8d..000000000000
--- a/net/isc-dhcp31-server/files/patch-dhcpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
---- server/dhcpd.conf.orig	Thu Jan 25 03:33:11 2001
-+++ server/dhcpd.conf	Wed Jan 30 22:06:52 2002
-@@ -14,6 +14,9 @@
- # network, the authoritative directive should be uncommented.
- #authoritative;
- 
-+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates.
-+ddns-update-style ad-hoc;
-+
- # Use this to send dhcp log messages to a different log file (you also
- # have to hack syslog.conf to complete the redirection).
- log-facility local7;
diff --git a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist b/net/isc-dhcp31-server/files/patch-dst::Makefile.dist
deleted file mode 100644
index ad45436b1629..000000000000
--- a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist
+++ /dev/null
@@ -1,29 +0,0 @@
---- dst/Makefile.dist.orig	Sun Nov 17 03:27:43 2002
-+++ dst/Makefile.dist	Fri Mar  5 23:40:45 2004
-@@ -26,12 +26,24 @@
- 
- all:	libdst.a
- 
--install:
--
- libdst.a:	$(OBJ)
- 	rm -f dst.a
- 	ar cruv libdst.a $(OBJ)
- 	$(RANLIB) libdst.a
-+
-+install: all
-+	for dir in $(LIBDIR);\
-+	 do \
-+	  foo=""; \
-+	  for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
-+	    foo=$${foo}/$$bar; \
-+	    if [ ! -d $$foo ]; then \
-+	      mkdir $$foo; \
-+	      chmod 755 $$foo; \
-+	    fi; \
-+	  done; \
-+	done
-+	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
- 
- depend:
- 	$(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
diff --git a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h
deleted file mode 100644
index 071ac6ca5a29..000000000000
--- a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- includes/cf/freebsd.h.orig	Wed Sep  1 19:06:36 2004
-+++ includes/cf/freebsd.h	Mon May 15 09:13:18 2006
-@@ -33,7 +33,7 @@
-  */
- 
- #include <syslog.h>
--#include <sys/types.h>
-+#include <sys/param.h>
- #include <string.h>
- #include <paths.h>
- #include <errno.h>
-@@ -97,6 +97,10 @@
- #define SOCKLEN_T int
- #endif
- 
-+#ifdef RESCUE
-+#define _PATH_DHCLIENT_SCRIPT	"/rescue/dhclient-script"
-+#endif
-+
- #if defined (USE_DEFAULT_NETWORK)
- #  define USE_BPF
- #endif
-@@ -107,6 +111,9 @@
-  #endif /* HAVE_DEV_RANDOM */
- 
- const char *cmds[] = {
-+#ifndef RESCUE
-+	/* rescue environment can't rely on these ... */
-+	/* Actually, /sbin/dhclient shouldn't use these, either. */
- 	"/bin/ps -axlw 2>&1",
- 	"/usr/sbin/arp -an 2>&1",
- 	"/usr/bin/netstat -an 2>&1",
-@@ -117,10 +124,12 @@
- 	"/usr/sbin/iostat  2>&1",
- 	"/usr/bin/vmstat  2>&1",
- 	"/usr/bin/w  2>&1",
-+#endif
- 	NULL
- };
- 
- const char *dirs[] = {
-+#ifndef RESCUE
- 	"/tmp",
- 	"/usr/tmp",
- 	".",
-@@ -130,13 +139,16 @@
- 	"/var/mail",
- 	"/home",
- 	"/usr/home",
-+#endif
- 	NULL
- };
- 
- const char *files[] = {
-+#ifndef RESCUE
- 	"/var/log/messages",
- 	"/var/log/wtmp",
- 	"/var/log/lastlog",
-+#endif
- 	NULL
- };
- #endif /* NEED_PRAND_CONF */
diff --git a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h b/net/isc-dhcp31-server/files/patch-includes::dhcpd.h
deleted file mode 100644
index 1933e0b4037a..000000000000
--- a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- includes/dhcpd.h.orig	Mon Feb 10 02:22:46 2003
-+++ includes/dhcpd.h	Wed Mar  3 16:20:09 2004
-@@ -99,6 +99,9 @@
- 	 (((x) >> OPTION_HASH_EXP) & \
- 	  (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE;
- 
-+#define NOLINK 0
-+#define HAVELINK 1
-+
- enum dhcp_shutdown_state {
- 	shutdown_listeners,
- 	shutdown_omapi_connections,
-@@ -783,6 +786,11 @@
- 	unsigned remote_id_len;		/* Length of Remote ID. */
- 
- 	char name [IFNAMSIZ];		/* Its name... */
-+	int ieee80211;                  /* True if media is ieee802.11 */
-+	int havemedia;                  /* True if we have a media table */
-+	int linkstate;                  /* True if we have link */
-+	int polling;                    /* True if polling is enabled */
-+	int forcediscover;              /* True if a discover is needed */
- 	int index;			/* Its index. */
- 	int rfdesc;			/* Its read file descriptor. */
- 	int wfdesc;			/* Its write file descriptor, if
-@@ -1845,6 +1853,9 @@
- extern const char *path_dhclient_pid;
- extern char *path_dhclient_script;
- extern int interfaces_requested;
-+#ifdef ENABLE_POLLING_MODE
-+extern int polling_interval;
-+#endif
- 
- extern struct client_config top_level_config;
- 
-@@ -1858,12 +1869,21 @@
- void send_decline PROTO ((void *));
- 
- void state_reboot PROTO ((void *));
-+#ifdef ENABLE_POLLING_MODE
-+void state_background PROTO ((void *));
-+void state_polling PROTO ((void *));
-+#endif
- void state_init PROTO ((void *));
- void state_selecting PROTO ((void *));
- void state_requesting PROTO ((void *));
- void state_bound PROTO ((void *));
- void state_stop PROTO ((void *));
- void state_panic PROTO ((void *));
-+
-+#if __FreeBSD_version > 502010
-+void set_ieee80211 PROTO ((struct interface_info *));
-+#endif
-+int interface_active PROTO ((struct interface_info *));
- 
- void bind_lease PROTO ((struct client_state *));
- 
diff --git a/net/isc-dhcp31-server/files/patch-server::dhcpd.c b/net/isc-dhcp31-server/files/patch-server::dhcpd.c
deleted file mode 100644
index 1b19c62a7335..000000000000
--- a/net/isc-dhcp31-server/files/patch-server::dhcpd.c
+++ /dev/null
@@ -1,297 +0,0 @@
---- server/dhcpd.c.orig	2009-07-18 12:17:49.000000000 +0000
-+++ server/dhcpd.c	2009-07-18 12:16:17.000000000 +0000
-@@ -47,6 +47,22 @@
- #include "version.h"
- #include <omapip/omapip_p.h>
- 
-+#if defined (PARANOIA)
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <pwd.h>
-+/* get around the ISC declaration of group */
-+#define group real_group 
-+#include <grp.h>
-+#undef group
-+#endif /* PARANOIA */
-+#if defined (JAIL)
-+#include <sys/param.h>
-+#include <sys/jail.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#endif /* JAIL */
-+
- static void usage PROTO ((void));
- 
- struct iaddr server_identifier;
-@@ -193,6 +209,46 @@
- 	omapi_object_dereference (&listener, MDL);
- }
- 
-+#if defined (PARANOIA)
-+/* to be used in one of two possible scenarios */
-+static void setup_chroot (char *chroot_dir)
-+{
-+	if (geteuid ())
-+		log_fatal ("you must be root to use chroot");
-+	if (chroot (chroot_dir))
-+		log_fatal ("chroot(\"%s\"): %m", chroot_dir);
-+	if (chdir ("/"))
-+		/* probably permission denied */
-+		log_fatal ("chdir(\"/\"): %m");
-+}
-+#endif /* PARANOIA */
-+
-+#if defined (JAIL)
-+#if !defined(JAIL_API_VERSION)
-+#define	JAIL_API_VERSION	0
-+#endif
-+static void setup_jail (char *chroot_dir, char *hostname, struct in_addr ip_addr)
-+{
-+      struct jail j;
-+
-+      memset(&j, 0, sizeof(j));
-+      j.version = JAIL_API_VERSION;
-+      j.path = chroot_dir;
-+      j.hostname = hostname;
-+#if JAIL_API_VERSION == 0
-+      j.ip_number = ntohl(ip_addr.s_addr);
-+#elif JAIL_API_VERSION == 2
-+      j.ip4s = 1;
-+      j.ip4 = &ip_addr;
-+#else
-+#error Unsupported jail API
-+#endif
-+
-+      if (jail (&j) < 0)
-+              log_fatal ("jail(%s, %s): %m", chroot_dir, hostname);
-+}
-+#endif /* JAIL */
-+
- int main (argc, argv, envp)
- 	int argc;
- 	char **argv, **envp;
-@@ -225,6 +281,25 @@
- 	char *traceinfile = (char *)0;
- 	char *traceoutfile = (char *)0;
- #endif
-+#if defined (PARANOIA)
-+	char *set_user   = 0;
-+	char *set_group  = 0;
-+	uid_t set_uid = 0;
-+	gid_t set_gid = 0;
-+	int early_chroot = 0;
-+	int no_dhcpd_user = 0;
-+	int no_dhcpd_group = 0;
-+#endif /* PARANOIA */
-+#if defined (PARANOIA) || defined (JAIL)
-+	char *set_chroot = 0;
-+	int no_dhcpd_chroot = 0;
-+#endif /* PARANOIA || JAIL */
-+#if defined (JAIL)
-+	char *set_jail = 0;
-+	struct in_addr jail_ip_address;
-+	int no_dhcpd_jail = 0;
-+	char *s2;
-+#endif /* JAIL */
- 
-         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
-            2 (stderr) are open. To do this, we assume that when we
-@@ -290,6 +365,38 @@
- 			if (++i == argc)
- 				usage ();
- 			server = argv [i];
-+#if defined (PARANOIA)
-+		} else if (!strcmp (argv [i], "-user")) {
-+			if (++i == argc)
-+				usage ();
-+			set_user = argv [i];
-+			no_dhcpd_user = 1;
-+		} else if (!strcmp (argv [i], "-group")) {
-+			if (++i == argc)
-+				usage ();
-+			set_group = argv [i];
-+			no_dhcpd_group = 1;
-+		} else if (!strcmp (argv [i], "-early_chroot")) {
-+			early_chroot = 1;
-+#endif /* PARANOIA */
-+#if defined (PARANOIA) || defined (JAIL)
-+		} else if (!strcmp (argv [i], "-chroot")) {
-+			if (++i == argc)
-+				usage ();
-+			set_chroot = argv [i];
-+			no_dhcpd_chroot = 1;
-+#endif /* PARANOIA || JAIL */
-+#if defined (JAIL)
-+		} else if (!strcmp (argv [i], "-jail")) {
-+			if (++i == argc)
-+				usage ();
-+			set_jail = argv [i];
-+			if (++i == argc)
-+				usage ();
-+			if (inet_pton (AF_INET, argv[i], &jail_ip_address) < 0)
-+				log_fatal ("invalid ip address: %s", argv[i]);
-+			no_dhcpd_jail = 1;
-+#endif /* JAIL */
- 		} else if (!strcmp (argv [i], "-cf")) {
- 			if (++i == argc)
- 				usage ();
-@@ -367,6 +474,27 @@
- 	if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) {
- 		path_dhcpd_pid = s;
- 	}
-+#if defined (PARANOIA)
-+	if (!no_dhcpd_user && (s = getenv ("DHCPD_USER"))) {
-+		set_user = s;
-+	}
-+	if (!no_dhcpd_group && (s = getenv ("DHCPD_GROUP"))) {
-+		set_group = s;
-+	}
-+#endif /* PARANOIA */
-+#if defined (PARANOIA) || defined (JAIL)
-+	if (!no_dhcpd_chroot && (s = getenv ("PATH_DHCPD_CHROOT"))) {
-+		set_chroot = s;
-+	}
-+#endif /* PARANOIA || JAIL */
-+#if defined (JAIL)
-+	if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) &&
-+	    (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) {
-+		set_jail = s;
-+		if (inet_pton (AF_INET, s2, &jail_ip_address) < 0)
-+			log_fatal ("invalid ip address: %s", s2);
-+	}
-+#endif /* JAIL */
- 
- 	if (!quiet) {
- 		log_info ("%s %s", message, DHCP_VERSION);
-@@ -393,6 +521,57 @@
- 					     trace_seed_stop, MDL);
- #endif
- 
-+#if defined (PARANOIA)
-+	/* get user and group info if those options were given */
-+	if (set_user) {
-+		struct passwd *tmp_pwd;
-+
-+		if (geteuid ())
-+			log_fatal ("you must be root to set user");
-+
-+		if (!(tmp_pwd = getpwnam (set_user)))
-+			log_fatal ("no such user: %s", set_user);
-+
-+		set_uid = tmp_pwd->pw_uid;
-+
-+		/* use the user's group as the default gid */
-+		if (!set_group)
-+			set_gid = tmp_pwd->pw_gid;
-+	}
-+
-+	if (set_group) {
-+/* get around the ISC declaration of group */
-+#define group real_group
-+		struct group *tmp_grp;
-+
-+		if (geteuid ())
-+			log_fatal ("you must be root to set group");
-+
-+		if (!(tmp_grp = getgrnam (set_group)))
-+			log_fatal ("no such group: %s", set_group);
-+
-+		set_gid = tmp_grp->gr_gid;
-+#undef group
-+	}
-+#endif /* PARANOIA */
-+#if defined (JAIL)
-+	if (set_jail) {
-+		/* Initialize icmp support... */
-+		if (!cftest && !lftest)
-+			icmp_startup (1, lease_pinged);
-+		if(!set_chroot)
-+			set_chroot = "/";
-+		setup_jail (set_chroot, set_jail, jail_ip_address);
-+	}
-+#endif /* JAIL */
-+#if defined (PARANOIA) && defined (JAIL)
-+	else
-+#endif /* PARANOIA && JAIL */
-+#if defined (PARANOIA)
-+	if (early_chroot && set_chroot)
-+		setup_chroot (set_chroot);
-+#endif /* PARANOIA */
-+
- 	/* Default to the DHCP/BOOTP port. */
- 	if (!local_port)
- 	{
-@@ -467,6 +646,9 @@
- #endif
- 
- 	/* Initialize icmp support... */
-+#if defined (JAIL)
-+	if (!set_jail)
-+#endif /* JAIL */
- 	if (!cftest && !lftest)
- 		icmp_startup (1, lease_pinged);
- 
-@@ -496,6 +678,14 @@
- 
- 	postconf_initialization (quiet);
- 
-+#if defined (PARANOIA)
-+#if defined (JAIL)
-+	if (!set_jail)
-+#endif /* JAIL */
-+	if (!early_chroot && set_chroot)
-+		setup_chroot (set_chroot);
-+#endif /* PARANOIA */
-+
-         /* test option should cause an early exit */
-  	if (cftest && !lftest) 
-  		exit(0);
-@@ -538,7 +728,22 @@
- 		else if (pid)
- 			exit (0);
- 	}
-+  
-+#if defined (PARANOIA)
-+	/* change uid to the specified one */
-+	if (set_gid) {
-+		if (setgroups (0, (void *)0))
-+			log_fatal ("setgroups: %m");
-+		if (setgid (set_gid))
-+			log_fatal ("setgid(%d): %m", (int) set_gid);
-+	}
- 
-+	if (set_uid) {
-+		if (setuid (set_uid))
-+			log_fatal ("setuid(%d): %m", (int) set_uid);
-+	}
-+#endif /* PARANOIA */
-+  
- 	/* Read previous pid file. */
- 	if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
- 		status = read(i, pbuf, (sizeof pbuf) - 1);
-@@ -877,8 +1082,24 @@
- 	log_info (copyright);
- 	log_info (arr);
- 
--	log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
-+	log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s%s%s%s",
- 		   "\n             [-cf config-file] [-lf lease-file]",
-+
-+#if defined (PARANOIA)
-+		   /* meld into the following string */
-+		   "\n             [-user user] [-group group]",
-+		   "\n             [-chroot dir] [-early_chroot]",
-+#else /* PARANOIA */
-+		   "", "",
-+#endif /* PARANOIA */
-+
-+#if defined (JAIL)
-+		   /* then also these ones */
-+		   "\n             [-jail name ip]",
-+#else /* JAIL */
-+		   "",
-+#endif /* JAIL */
-+
- #if defined (TRACING)
- 		   "\n		   [-tf trace-output-file]",
- 		   "\n		   [-play trace-input-file]",
diff --git a/net/isc-dhcp31-server/files/patch-site.conf b/net/isc-dhcp31-server/files/patch-site.conf
deleted file mode 100644
index 1149e0c7925c..000000000000
--- a/net/isc-dhcp31-server/files/patch-site.conf
+++ /dev/null
@@ -1,42 +0,0 @@
---- site.conf.orig	Wed Jul  7 17:20:10 1999
-+++ site.conf	Wed Mar  3 14:00:14 2004
-@@ -1,2 +1,39 @@
- # Put local site configuration stuff here to override the default
- # settings in Makefile.conf
-+
-+PREFIX ?=	/usr/local
-+
-+USERBINDIR =	$(PREFIX)/bin
-+BINDIR =	$(PREFIX)/sbin
-+CLIENTBINDIR =	$(PREFIX)/sbin
-+ADMMANDIR =	$(PREFIX)/man/man8
-+ADMMANEXT =	.8
-+FFMANDIR =	$(PREFIX)/man/man5
-+FFMANEXT =	.5
-+LIBMANDIR =	$(PREFIX)/man/man3
-+LIBMANEXT =	.3
-+USRMANDIR =	$(PREFIX)/man/man1
-+USRMANEXT =	.1
-+MANCAT =	man
-+# INSTALL =	${INSTALL_DATA}
-+# MANINSTALL =	${INSTALL_MAN}
-+ETC =		$(PREFIX)/etc
-+LIBDIR =	${PREFIX}/lib
-+INCDIR =	${PREFIX}/include
-+CLIENT_PATH =	\"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\"
-+
-+DEBUG ?=	#none
-+
-+CFLAGS +=	-D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\"
-+CFLAGS +=	-D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\"
-+CFLAGS +=	-D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\"
-+
-+CFLAGS +=	-D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\"
-+CFLAGS +=	-D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\"
-+CFLAGS +=	-D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\"
-+CFLAGS +=	-D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\"
-+
-+CFLAGS +=	-Dwarn=dhcp_warn
-+CFLAGS +=	-DNOMINUM
diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr
deleted file mode 100644
index 86bbb3cc62f0..000000000000
--- a/net/isc-dhcp31-server/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-The ISC Dynamic Host Configuration Protocol Distribution provides a
-freely redistributable reference implementation of all aspects of the
-DHCP protocol, through a suite of DHCP tools:
-
-  * A DHCP server (this port)
-  * A DHCP client
-  * A DHCP relay agent
-
-Version 3 of the ISC DHCP Distribution includes the following features
-that are new since version 2.0:
-
-  * DHCP Failover Protocol support
-  * OMAPI, an API for accessing and modifying the DHCP server and client state
-  * Conditional behaviour
-  * Storing arbitrary information on leases
-  * Address pools with access control
-  * Client classing
-  * Address allocation restriction by class
-  * Relay agent information option support 
-  * Dynamic DNS updates
-  * Many bug fixes, performance enhancements, and minor new DHCP protocol
-    features. 
-
-WWW: http://www.isc.org/products/DHCP/
diff --git a/net/isc-dhcp31-server/pkg-install b/net/isc-dhcp31-server/pkg-install
deleted file mode 100644
index 547e94efc046..000000000000
--- a/net/isc-dhcp31-server/pkg-install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-[ $# != 2 ] && exit 1
-[ -z "${PKG_PREFIX}" ] && exit 1
-[ -n "${BATCH}" ] && exit 0
-
-case $2 in
-POST-INSTALL)
-	if [ -x ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
-		${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
-	else
-		${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
-	fi
-	;;
-DEINSTALL)
-	if [ -x ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
-		${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
-	else
-		${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
-	fi
-	;;
-POST-DEINSTALL|PRE-INSTALL)
-	;;
-*)
-	echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2
-	exit 1
-	;;
-esac
diff --git a/net/isc-dhcp31-server/pkg-message b/net/isc-dhcp31-server/pkg-message
deleted file mode 100644
index 0322afe1ce24..000000000000
--- a/net/isc-dhcp31-server/pkg-message
+++ /dev/null
@@ -1,53 +0,0 @@
-****  To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample
-      to %%PREFIX%%/etc/dhcpd.conf for editing.
-
-****  This port installs dhcp daemon, but doesn't invoke dhcpd by default. If
-      you want to invoke dhcpd at startup, put these lines into /etc/rc.conf.
-
-	    dhcpd_enable="YES"				# dhcpd enabled?
-	    dhcpd_flags="-q"				# command option(s)
-	    dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf"	# configuration file
-	    dhcpd_ifaces=""				# ethernet interface(s)
-	    dhcpd_withumask="022"			# file creation mask
-
-****  If compiled with paranoia support (the default), the following lines
-      are also supported:
-
-	    dhcpd_chuser_enable="YES"			# runs w/o privileges?
-	    dhcpd_withuser="dhcpd"			# user name to run as
-	    dhcpd_withgroup="dhcpd"			# group name to run as
-	    dhcpd_chroot_enable="YES"			# runs chrooted?
-	    dhcpd_devfs_enable="YES"		      # use devfs if available?
-	    dhcpd_makedev_enable="YES"		      # use MAKEDEV instead?
-	    dhcpd_rootdir="/var/db/dhcpd"		# directory to run in
-	    dhcpd_includedir="<some_dir>"		# directory with config-
-							  files to include
-	    dhcpd_flags="-early_chroot"			# needs full root
-
-      WARNING: -early_chroot requires a jail(8) like environment to work.
-
-      WARNING: dhcpd_devfs_enable and dhcpd_makedev_enable are mutually
-               exclusive 
-               dhcpd_makedev_enable make NO sense on FreeBSD 5.x and up!
-
-****  If compiled with jail support (the default), the following lines are
-      also supported (-early_chroot and dhcpd_chroot_enable=YES are implied):
-
-	    dhcpd_jail_enable="YES"			# runs imprisoned?
-            dhcpd_hostname="<hostname>"			# jail hostname
-            dhcpd_ipaddress="<ip address>"		# jail ip address
-
-      WARNING: dhcpd_rootdir needs to point to a full jail(8) environment.
-
-****  WARNING: never edit the chrooted or jailed dhcpd.conf file but
-      %%PREFIX%%/etc/dhcpd.conf instead which is always copied where
-      needed upon startup.
-
-****  WARNING: %%PREFIX%%/etc/rc.isc-dhcpd.conf is obsolete.  rc.conf like
-      variables are still read there but should be moved /etc/rc.conf or
-      /etc/rc.conf.d/dhcpd instead.  Also, the dhcpd_options variable must
-      be renamed dhcpd_flags if any.
-%%LDAP%%
-%%LDAP%%****  You have requested support for the LDAP configuration backend.
-%%LDAP%%      The OpenLDAP schema file is installed as %%SCHEMA_DIR%%/dhcp.schema.
-%%LDAP%%      See %%DOCSDIR%%/README.ldap for further LDAP configuration details.
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
deleted file mode 100644
index e1028012ff4e..000000000000
--- a/net/isc-dhcp31-server/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $FreeBSD$
-@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
-bin/omshell
-%%LDAP%%bin/dhcpd-conf-to-ldap.pl
-etc/dhcpd.conf.sample
-sbin/dhcpd
-%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
-%%LDAP%%@dirrm %%SCHEMA_DIR%%