ports/97940: Port update net/kiax

Fri May 26 02:20:21 UTC 2006

The following reply was made to PR ports/97940; it has been noted by GNATS.

From: Eric Kjeldergaard <kjelderg at gmail.com>
To: bug-followup at freebsd.org,
 kjelderg at gmail.com
Cc:  
Subject: Re: ports/97940: Port update net/kiax
Date: Thu, 25 May 2006 21:18:43 -0500

 --nextPart3595839.rKvVyrLOAc
 Content-Type: multipart/mixed;
   boundary="Boundary-01=_MWmdEykhjeKFDGD"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline

 --Boundary-01=_MWmdEykhjeKFDGD
 Content-Type: text/plain;
   charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline

 unidiff version.
 =2D-=20
 The signature is a location used to give a personalised feel to each E-mail=
 =20
 without having to personalise each E-mail.

 --Boundary-01=_MWmdEykhjeKFDGD
 Content-Type: text/x-diff;
   charset="utf-8";
   name="kiax.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="kiax.diff"

 diff -urN kiax.orig/Makefile kiax/Makefile
 =2D-- kiax.orig/Makefile	Mon Apr  3 19:52:54 2006
 +++ kiax/Makefile	Thu May 25 21:16:00 2006
 @@ -2,14 +2,15 @@
  # Date created:        Sat Jun 25 16:31:30 UTC 2005
  # Whom:                Eric Kjeldergaard <kjelderg at gmail.com>
  #
 =2D# $FreeBSD: ports/net/kiax/Makefile,v 1.3 2006/04/01 10:27:14 lawrance E=
 xp $
 +# $FreeBSD$
  #
 =20
  PORTNAME=3D	kiax
 =2DPORTVERSION=3D	0.8.4
 +PORTVERSION=3D	0.8.5
  CATEGORIES=3D	net
  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=3D	${PORTNAME}
 +DISTNAME=3D	kiax-0.8.5-src
 =20
  MAINTAINER=3D	kjelderg at gmail.com
  COMMENT=3D	An Asterisk (IAX) client written in QT for KDE
 @@ -18,7 +19,7 @@
  	lrelease:${PORTSDIR}/x11-toolkits/qt33
 =20
  USE_GMAKE=3D	yes
 =2DUSE_BZIP2=3D	yes
 +#USE_BZIP2=3D	yes
  GNU_CONFIGURE=3D	yes
  USE_PERL5_BUILD=3D	yes
  USE_QT_VER=3D	3
 @@ -33,11 +34,6 @@
 =20
  .if ${OSVERSION} < 500000
  BROKEN=3D		does not compile
 =2D.endif
 =2D
 =2Dpost-patch:
 =2D.if ${OSVERSION} < 500000
 =2D	${REINPLACE_CMD} 's/stdint\.h/inttypes.h/' ${WRKSRC}/lib/spandsp/plc.h
  .endif
 =20
  .include <bsd.port.post.mk>
 diff -urN kiax.orig/distinfo kiax/distinfo
 =2D-- kiax.orig/distinfo	Sun Jan 22 15:23:09 2006
 +++ kiax/distinfo	Thu May 25 21:16:00 2006
 @@ -1,3 +1,3 @@
 =2DMD5 (kiax-0.8.4.tar.bz2) =3D 508f65e79f23155e50e6ca5684697221
 =2DSHA256 (kiax-0.8.4.tar.bz2) =3D 57cbcbf3e7f7b229302f02fda4d97aef16cfbc40=
 c89ef90fec8a42ae83d0a564
 =2DSIZE (kiax-0.8.4.tar.bz2) =3D 606213
 +SIZE (kiax-0.8.5-src.tar.gz) =3D 1479222
 +MD5 (kiax-0.8.5-src.tar.gz) =3D 6bc7a9a94be7a3e998113311ce4e5847
 +SHA256 (kiax-0.8.5-src.tar.gz) =3D b24177ecd352517a5e5a4d193944be2344a1031=
 30311ac0197c556802560521f
 diff -urN kiax.orig/files/patch-lib_libiax2_src_iax.c kiax/files/patch-lib_=
 libiax2_src_iax.c
 =2D-- kiax.orig/files/patch-lib_libiax2_src_iax.c	Sun Nov 13 07:39:01 2005
 +++ kiax/files/patch-lib_libiax2_src_iax.c	Thu May 25 21:16:00 2006
 @@ -1,31 +1,27 @@
 =2D--- lib/libiax2/src/iax.c.orig	Sun Nov 13 13:59:36 2005
 =2D+++ lib/libiax2/src/iax.c	Sun Nov 13 14:21:46 2005
 =2D@@ -53,11 +53,13 @@
 +--- lib/libiax2/src/iax.c.orig	Thu May 25 18:42:18 2006
 ++++ lib/libiax2/src/iax.c	Thu May 25 18:44:26 2006
 +@@ -59,14 +59,12 @@ void gettimeofday(struct timeval *tv, vo
 + #include <arpa/inet.h>
   #include <time.h>
  =20
 =2D #ifndef MACOSX
 =2D+#ifndef __FreeBSD__
 +-#ifndef MACOSX
 ++#if !defined(MACOSX) && !defined(__FreeBSD__)
   #include <malloc.h>
   #ifndef SOLARIS
 +-#if !defined(__NetBSD__) && !defined(__FreeBSD__)
   #include <error.h>
   #endif
   #endif
 =2D+#endif
 +-#endif
 + =20
 +  #endif
  =20
 =2D #endif
 =2D=20
 =2D@@ -85,10 +87,14 @@
 =2D #ifdef MACOSX
 +@@ -97,7 +95,7 @@ void gettimeofday(struct timeval *tv, vo
 + #ifdef SOLARIS
   #define IAX_SOCKOPTS MSG_DONTWAIT
   #else
 =2D+#ifdef __FreeBSD__
 =2D+#define IAX_SOCKOPTS MSG_DONTWAIT
 =2D+#else
 =2D #ifdef SOLARIS
 +-#ifdef __NetBSD__
 ++#if defined(__NetBSD__) || defined(__FreeBSD__)
   #define IAX_SOCKOPTS MSG_DONTWAIT
   #else  /* Linux and others */
   #define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL
 =2D+#endif
 =2D #endif
 =2D #endif
 =2D #endif
 diff -urN kiax.orig/files/patch-lib_libiax2_src_md5.c kiax/files/patch-lib_=
 libiax2_src_md5.c
 =2D-- kiax.orig/files/patch-lib_libiax2_src_md5.c	Sat Nov 12 08:25:14 2005
 +++ kiax/files/patch-lib_libiax2_src_md5.c	Wed Dec 31 18:00:00 1969
 @@ -1,11 +0,0 @@
 =2D--- lib/libiax2/src/md5.c.orig	Sat Nov 12 17:34:12 2005
 =2D+++ lib/libiax2/src/md5.c	Sat Nov 12 17:35:18 2005
 =2D@@ -1,7 +1,7 @@
 =2D /* MD5 checksum routines used for authentication.  Not covered by GPL, =
 but
 =2D    in the public domain as per the copyright below */
 =2D=20
 =2D-#ifdef FREEBSD
 =2D+#ifdef __FreeBSD__
 =2D # include <machine/endian.h>
 =2D #elif defined(LINUX) =20
 =2D # include <endian.h>
 diff -urN kiax.orig/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c kia=
 x/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c
 =2D-- kiax.orig/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c	Sat Nov=
  12 08:25:14 2005
 +++ kiax/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c	Wed Dec 31 18:=
 00:00 1969
 @@ -1,14 +0,0 @@
 =2D--- lib/portmixer/px_unix_oss/px_unix_oss.c.orig	Sat Nov 12 17:36:03 2005
 =2D+++ lib/portmixer/px_unix_oss/px_unix_oss.c	Sat Nov 12 17:38:29 2005
 =2D@@ -38,7 +38,11 @@
 =2D #ifdef __linux__
 =2D #include <linux/soundcard.h>
 =2D #else
 =2D+#ifdef __FreeBSD__
 =2D+#include <sys/soundcard.h>
 =2D+#else
 =2D #include <machine/soundcard.h> /* JH20010905 */
 =2D+#endif
 =2D #endif
 =2D=20
 =2D #include <stdio.h>

 --Boundary-01=_MWmdEykhjeKFDGD--

 --nextPart3595839.rKvVyrLOAc
 Content-Type: application/pgp-signature

 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)

 iD8DBQBEdmWQSMnO3Fce5JgRAjC3AJ9lTrPpnnC9AW9PVU2dVFl+mo1KcwCgmWQO
 qHqFsXh3NCyQ+kFFDyZ748s=
 =2RSQ
 -----END PGP SIGNATURE-----

 --nextPart3595839.rKvVyrLOAc--