6 files changed, 41 insertions, 83 deletions

diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index 6bf61f915a11..6cf0a5e61e23 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	iaxmodem
-PORTVERSION=	0.1.14
+PORTVERSION=	0.3.2
 CATEGORIES=	net comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,8 +29,6 @@ GNU_CONFIGURE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/etc|${PREFIX}/etc|g" ${WRKSRC}/iaxmodem.1
 	@${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}/etc/iaxmodem|g" ${WRKSRC}/iaxmodem.c
-	@${CP} ${FILESDIR}/configure ${FILESDIR}/Makefile.in ${WRKSRC}/
-	@${CHMOD} a+x ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin/ && \
diff --git a/net/iaxmodem/distinfo b/net/iaxmodem/distinfo
index fbd431dbf356..337475a506c4 100644
--- a/net/iaxmodem/distinfo
+++ b/net/iaxmodem/distinfo
@@ -1,3 +1,3 @@
-MD5 (iaxmodem-0.1.14.tar.gz) = 00cf7a266da5633fa67b3706944fca30
-SHA256 (iaxmodem-0.1.14.tar.gz) = f1dbce6f2fbab8e53ef84c160f06f891463a8d8dfc0f5155c6e697663179e0f8
-SIZE (iaxmodem-0.1.14.tar.gz) = 2058627
+MD5 (iaxmodem-0.3.2.tar.gz) = ab4ecc268e521585d1d1e9fcca912e4d
+SHA256 (iaxmodem-0.3.2.tar.gz) = 4aa48291f38bb400285c6e236a8caf868b25e1e65df4f600d36ea493c8f35e9e
+SIZE (iaxmodem-0.3.2.tar.gz) = 2229564
diff --git a/net/iaxmodem/files/Makefile.in b/net/iaxmodem/files/Makefile.in
deleted file mode 100644
index e19e285d2dd0..000000000000
--- a/net/iaxmodem/files/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-MODEMVER=	iaxmodem-0.1.14
-DSPVER=		@DSPVER@
-IAXVER=		@IAXVER@
-
-CFLAGS:=	-DMODEMVER=\"${MODEMVER}\" -DDSPVER=\"${DSPVER}\" -DIAXVER=\"${IAXVER}\" \
-		-Wall -g -DSTATICLIBS -D_GNU_SOURCE \
-		-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src \
-		${CFLAGS}
-OUR_CFLAGS=	-Wall -g -DSTATICLIBS -D_GNU_SOURCE \
-		-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src
-OBJS=		iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
-LDFLAGS+=	-lm -lutil -ltiff
-
-all: iaxmodem
-
-iaxmodem: build-libiax build-libspandsp iaxmodem.o
-	${CC} ${CFLAGS} ${OBJS} -o iaxmodem ${LDFLAGS}
-
-iaxmodem.o: iaxmodem.c
-	${CC} ${CFLAGS} -c iaxmodem.c
-
-build-libiax:
-	cd lib/libiax2 && ${MAKE}
-
-build-libspandsp:
-	cd lib/spandsp && ${MAKE}
-
-clean:
-	rm -f *.o && \
-	cd lib/libiax2 && ${MAKE} clean && \
-	cd ../../lib/spandsp && ${MAKE} clean
-
diff --git a/net/iaxmodem/files/configure b/net/iaxmodem/files/configure
deleted file mode 100644
index abc5f4f85174..000000000000
--- a/net/iaxmodem/files/configure
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-cd lib/libiax2 && \
-./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \
-cd ../../lib/spandsp && \
-./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \
-cd ../..
-
-if [ $? != 0 ]; then
-	exit 1
-fi
-
-STEP1=`grep @VERSION@ lib/spandsp/config.status | sed 's/;.*//g'`
-DSPVER=`echo "@VERSION@" | sed ${STEP1}`
-if [ -n "${DSPVER}" ]; then
-	DSPVER="spandsp-${DSPVER}-snapshot-20060707+"
-fi
-STEP1=`grep @VERSION@ lib/libiax2/config.status | sed 's/;.*//g'`
-IAXVER=`echo "@VERSION@" | sed ${STEP1}`
-if [ -n "${IAXVER}" ]; then
-	IAXVER="libiax2-${IAXVER}-CVS-20060222+"
-fi
-
-cat Makefile.in | sed -e "s/@DSPVER@/${DSPVER}/g" | \
-	sed -e "s/@IAXVER@/${IAXVER}/g" > Makefile
-
-echo ${IAXVER}
-echo ${DSPVER}
-
-exit $?
-
diff --git a/net/iaxmodem/files/patch-iaxmodem.c b/net/iaxmodem/files/patch-iaxmodem.c
index 89e46978e70f..98ad623f93a8 100644
--- a/net/iaxmodem/files/patch-iaxmodem.c
+++ b/net/iaxmodem/files/patch-iaxmodem.c
@@ -1,29 +1,51 @@
---- iaxmodem.c.orig	Mon Jul 31 15:29:29 2006
-+++ iaxmodem.c	Fri Aug 11 20:23:50 2006
-@@ -17,12 +17,14 @@
-  */
- #include <stdio.h>
+--- iaxmodem.c.orig	2007-10-06 12:22:04.000000000 -0400
++++ iaxmodem.c	2007-11-06 23:54:40.000000000 -0500
+@@ -21,17 +21,18 @@
  #include <string.h>
+ #include <strings.h>
+ 
 -#ifndef __OpenBSD__
 +#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <pty.h>
+ # ifndef USE_UNIX98_PTY
+ #  include <pty.h>
+ # endif /* !USE_UNIX98_PTY */
  #else
- #include <termios.h>
++#include <termios.h>
 +#if !defined(__FreeBSD__)
- #include <util.h>
+ # include <util.h>
  #endif
 +#endif
+ 
+ 
+-#include <termios.h>
+-
  #include <stdlib.h>
  #include <unistd.h>
  #include <dirent.h>
-@@ -44,6 +46,10 @@
+@@ -53,6 +54,26 @@
  #include <math.h>
  
  #include <stdint.h>
 +
 +#ifdef __FreeBSD__
 +#include <libutil.h>
++char* strndup(const char* string, size_t n)
++{
++        char* copy_string = 0;
++
++        if(0 == string || 0 == n)
++                return 0;
++
++        copy_string = (char*) malloc(n + 1);
++        if(0 == copy_string)
++                return 0;
++
++        memcpy(copy_string, string, n);
++        *(copy_string + n) = '\0';
++
++        return copy_string;
++}
 +#endif
  #include <tiffio.h>
  
- #include <spandsp.h>
+ #ifndef O_LARGEFILE
diff --git a/net/iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h b/net/iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h
index 12e6f7036c66..d0a1d347322a 100644
--- a/net/iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h
+++ b/net/iaxmodem/files/patch-lib_spandsp_src_spandsp_t4.h
@@ -1,11 +1,11 @@
---- lib/spandsp/src/spandsp/t4.h.orig	Mon Jun 12 15:54:34 2006
-+++ lib/spandsp/src/spandsp/t4.h	Thu Jun 15 14:17:20 2006
-@@ -28,6 +28,8 @@
+--- lib/spandsp/src/spandsp/t4.h.orig	2007-10-05 20:00:19.000000000 -0400
++++ lib/spandsp/src/spandsp/t4.h	2007-11-06 23:57:56.000000000 -0500
+@@ -27,6 +27,8 @@
  
  /*! \file */
  
 +#include <time.h>
 +
- #if !defined(_T4_H_)
- #define _T4_H_
+ #if !defined(_SPANDSP_T4_H_)
+ #define _SPANDSP_T4_H_