- update to 0.8.5

PR:		ports/97940
Submitted by:	Eric Kjeldergaard <kjelderg@gmail.com>

6 files changed, 30 insertions, 53 deletions

diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 1bf79df3842c..e2466e06e277 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	kiax
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	kiax-0.8.5-src
 
 MAINTAINER=	kjelderg@gmail.com
 COMMENT=	An Asterisk (IAX) client written in QT for KDE
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
 	lrelease:${PORTSDIR}/x11-toolkits/qt33
 
 USE_GMAKE=	yes
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 USE_QT_VER=	3
@@ -35,9 +35,4 @@ MAKE_ARGS+=	QTDIR=${X11BASE} \
 BROKEN=		does not compile
 .endif
 
-post-patch:
-.if ${OSVERSION} < 500000
-	${REINPLACE_CMD} 's/stdint\.h/inttypes.h/' ${WRKSRC}/lib/spandsp/plc.h
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/kiax/distinfo b/net/kiax/distinfo
index 56b05ab9cd78..535216663ffa 100644
--- a/net/kiax/distinfo
+++ b/net/kiax/distinfo
@@ -1,3 +1,3 @@
-MD5 (kiax-0.8.4.tar.bz2) = 508f65e79f23155e50e6ca5684697221
-SHA256 (kiax-0.8.4.tar.bz2) = 57cbcbf3e7f7b229302f02fda4d97aef16cfbc40c89ef90fec8a42ae83d0a564
-SIZE (kiax-0.8.4.tar.bz2) = 606213
+SIZE (kiax-0.8.5-src.tar.gz) = 1479222
+MD5 (kiax-0.8.5-src.tar.gz) = 6bc7a9a94be7a3e998113311ce4e5847
+SHA256 (kiax-0.8.5-src.tar.gz) = b24177ecd352517a5e5a4d193944be2344a103130311ac0197c556802560521f
diff --git a/net/kiax/files/patch-lib_libiax2_src_iax.c b/net/kiax/files/patch-lib_libiax2_src_iax.c
index 2a82e5ee885d..ecaf61a815d8 100644
--- a/net/kiax/files/patch-lib_libiax2_src_iax.c
+++ b/net/kiax/files/patch-lib_libiax2_src_iax.c
@@ -1,31 +1,27 @@
---- lib/libiax2/src/iax.c.orig	Sun Nov 13 13:59:36 2005
-+++ lib/libiax2/src/iax.c	Sun Nov 13 14:21:46 2005
-@@ -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>
  
- #ifndef MACOSX
-+#ifndef __FreeBSD__
+-#ifndef MACOSX
++#if !defined(MACOSX) && !defined(__FreeBSD__)
  #include <malloc.h>
  #ifndef SOLARIS
+-#if !defined(__NetBSD__) && !defined(__FreeBSD__)
  #include <error.h>
  #endif
  #endif
-+#endif
+-#endif
+  
+  #endif
  
- #endif
- 
-@@ -85,10 +87,14 @@
- #ifdef MACOSX
+@@ -97,7 +95,7 @@ void gettimeofday(struct timeval *tv, vo
+ #ifdef SOLARIS
  #define IAX_SOCKOPTS MSG_DONTWAIT
  #else
-+#ifdef __FreeBSD__
-+#define IAX_SOCKOPTS MSG_DONTWAIT
-+#else
- #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
-+#endif
- #endif
- #endif
- #endif
diff --git a/net/kiax/files/patch-lib_libiax2_src_md5.c b/net/kiax/files/patch-lib_libiax2_src_md5.c
deleted file mode 100644
index 6dc1fb04ca6c..000000000000
--- a/net/kiax/files/patch-lib_libiax2_src_md5.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libiax2/src/md5.c.orig	Sat Nov 12 17:34:12 2005
-+++ lib/libiax2/src/md5.c	Sat Nov 12 17:35:18 2005
-@@ -1,7 +1,7 @@
- /* MD5 checksum routines used for authentication.  Not covered by GPL, but
-    in the public domain as per the copyright below */
- 
--#ifdef FREEBSD
-+#ifdef __FreeBSD__
- # include <machine/endian.h>
- #elif defined(LINUX)  
- # include <endian.h>
diff --git a/net/kiax/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c b/net/kiax/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c
deleted file mode 100644
index e2df308dbf91..000000000000
--- a/net/kiax/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/portmixer/px_unix_oss/px_unix_oss.c.orig	Sat Nov 12 17:36:03 2005
-+++ lib/portmixer/px_unix_oss/px_unix_oss.c	Sat Nov 12 17:38:29 2005
-@@ -38,7 +38,11 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #else
-+#ifdef __FreeBSD__
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h> /* JH20010905 */
-+#endif
- #endif
- 
- #include <stdio.h>
diff --git a/net/kiax/pkg-plist b/net/kiax/pkg-plist
index 5c811bc21504..bddfdb080452 100644
--- a/net/kiax/pkg-plist
+++ b/net/kiax/pkg-plist
@@ -1,17 +1,28 @@
 bin/kiax
 %%DATADIR%%/i18n/kiax_bg.qm
+%%DATADIR%%/i18n/kiax_cs.qm
 %%DATADIR%%/i18n/kiax_de.qm
 %%DATADIR%%/i18n/kiax_en.qm
+%%DATADIR%%/i18n/kiax_es.qm
 %%DATADIR%%/i18n/kiax_fr.qm
+%%DATADIR%%/i18n/kiax_he.qm
+%%DATADIR%%/i18n/kiax_it.qm
 %%DATADIR%%/i18n/kiax_mk.qm
 %%DATADIR%%/i18n/kiax_pl.qm
 %%DATADIR%%/i18n/kiax_pt.qm
+%%DATADIR%%/icons/account-connected.png
+%%DATADIR%%/icons/account-connecting.png
+%%DATADIR%%/icons/account-rejected.png
+%%DATADIR%%/icons/account-small.png
+%%DATADIR%%/icons/account-timeout.png
+%%DATADIR%%/icons/account.png
 %%DATADIR%%/icons/contact.png
 %%DATADIR%%/icons/dial.png
 %%DATADIR%%/icons/failed.png
 %%DATADIR%%/icons/hangup.png
 %%DATADIR%%/icons/hold.png
 %%DATADIR%%/icons/incoming.png
+%%DATADIR%%/icons/kiaxlogo.png
 %%DATADIR%%/icons/missed.png
 %%DATADIR%%/icons/outgoing.png
 %%DATADIR%%/icons/resume.png