Update "kphone" package to version 4.2. Change since version 4.1.0:

- ILBC 20ms implementation added
- Some new translations
- Alsa support updated
- Some qt3 fixes
- Saved password support added
- DTMF support updated
- Command line call support added
- SRTP support added (see INSTALL file)
- Some new translations
- Alsa support updated

Update contributed by Stephen Borrill in PR pkg/32159.

6 files changed, 37 insertions, 45 deletions

diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index e682475b421..9f3b177b087 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/29 10:15:18 tron Exp $
 
-DISTNAME=		kphone-4.1.0
+DISTNAME=		kphone-4.2
 CATEGORIES=		net comms
 MASTER_SITES=		http://www.wirlab.net/kphone/
 
diff --git a/net/kphone/distinfo b/net/kphone/distinfo
index a410720e6a3..8a75dc65d0a 100644
--- a/net/kphone/distinfo
+++ b/net/kphone/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.7 2005/05/26 21:01:07 tron Exp $
+$NetBSD: distinfo,v 1.8 2005/11/29 10:15:18 tron Exp $
 
-SHA1 (kphone-4.1.0.tar.gz) = e29dd86e3bb9257099ffac393c546bd38bbd5cf7
-RMD160 (kphone-4.1.0.tar.gz) = a1552ba6ff8ef26da3e3f08bcffb3c71c5b59a54
-Size (kphone-4.1.0.tar.gz) = 278918 bytes
+SHA1 (kphone-4.2.tar.gz) = 10c7559b79fb13f42714008cd89a3981f66df2cf
+RMD160 (kphone-4.2.tar.gz) = 6176a97d19fe05741503f5b81dfd21e6130193e1
+Size (kphone-4.2.tar.gz) = 287320 bytes
 SHA1 (patch-aa) = ecb31fdeeaf4cb2a5aafe50b5fe58b85375cfd65
 SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31
-SHA1 (patch-ac) = 71ee825881b0a9135bdc4259c96a622e0c9cb268
-SHA1 (patch-ad) = 1017e963c72ac24b1b86f4c810222a8ee0583f33
+SHA1 (patch-ac) = 7b58171b4cb7b56c6ee939a86f861744ee7b6673
+SHA1 (patch-ad) = e69160d4ff68420a473d1f8b64ef32e3b8cedc24
 SHA1 (patch-ae) = 9d92b2585f673c7275a153f41c72623ad08b0b78
-SHA1 (patch-af) = ec4db1b1aa799395df94cb605e4d56f0a4ba8892
-SHA1 (patch-ag) = 3eb22f2e4a69cabd984d3ab861618997379bf47a
+SHA1 (patch-af) = 6bd63111a707d50096b360e7f0821cdafb3c798d
+SHA1 (patch-ag) = 666218619747ba1107f1967a86eb2fcb680dce7b
 SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7
 SHA1 (patch-ai) = bba9c0f8ab9c34e65b43e283e4d29e78aecd642c
 SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936
diff --git a/net/kphone/patches/patch-ac b/net/kphone/patches/patch-ac
index ff7abf0b2b6..018bc72e966 100644
--- a/net/kphone/patches/patch-ac
+++ b/net/kphone/patches/patch-ac
@@ -1,7 +1,5 @@
-$NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
-
---- dissipate2/siputil.cpp.orig	2004-03-04 11:22:57.000000000 +0000
-+++ dissipate2/siputil.cpp	2004-07-21 12:11:34.000000000 +0100
+--- dissipate2/siputil.cpp.orig	2005-06-21 12:14:49.000000000 +0100
++++ dissipate2/siputil.cpp	2005-11-24 16:47:03.000000000 +0000
 @@ -5,6 +5,9 @@
  #include <sys/time.h>
  #include <sys/errno.h>
@@ -12,15 +10,15 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  #include <net/if_arp.h>
  #include <net/route.h>
  #include <net/if.h>
-@@ -12,6 +15,7 @@
- #include <arpa/inet.h>
+@@ -13,6 +16,7 @@
+ #include <qobject.h>
  #include <qmessagebox.h>
  #include <netdb.h>
 +#include <errno.h>
  #include <fcntl.h>
  #include <stdio.h>
  #include <unistd.h>
-@@ -25,6 +29,8 @@
+@@ -26,6 +30,8 @@
  /* max number of network interfaces*/
  #define MAX_IF 5
  
@@ -29,7 +27,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  /* Path to the route entry in proc filesystem */
  #define PROCROUTE "/proc/net/route"
  
-@@ -40,6 +46,8 @@
+@@ -41,6 +47,8 @@
  #define SIOCGIFCOUNT 0x8935
  #endif
  
@@ -38,7 +36,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  char iface[16];
  
  
-@@ -61,6 +69,7 @@
+@@ -62,6 +70,7 @@
   */
  char *getdefaultdev()
  {
@@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  	FILE *fp = fopen( PROCROUTE, "r");
  	char buff[4096], gate_addr[128], net_addr[128];
  	char mask_addr[128];
-@@ -84,19 +93,49 @@
+@@ -85,19 +94,49 @@
  			return iface;
  	}
  	fclose(fp);
@@ -99,7 +97,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  	netconf.ifc_len = 32 * MAX_IF;
  	netconf.ifc_buf = buffer;
  	sock=socket( PF_INET, SOCK_DGRAM, 0 );
-@@ -104,9 +143,11 @@
+@@ -105,9 +144,11 @@
  	if ( err < 0 ) printf( "Error in ioctl: %i.\n", errno );
  	close( sock );
  	if_count = netconf.ifc_len / 32;
@@ -111,7 +109,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $
  	if ( if_count == 1 ) {
  		strncpy( if_name[j], netconf.ifc_req[0].ifr_name, 20 );
  		strncpy( if_addr[j], inet_ntoa(((struct sockaddr_in*)(&netconf.ifc_req[0].ifr_addr))->sin_addr), 20 );
-@@ -120,6 +161,8 @@
+@@ -122,6 +163,8 @@
  			}
  		}
  	}
diff --git a/net/kphone/patches/patch-ad b/net/kphone/patches/patch-ad
index 3a3db7cc7f4..1a319ab88da 100644
--- a/net/kphone/patches/patch-ad
+++ b/net/kphone/patches/patch-ad
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.1 2004/07/21 21:49:02 scw Exp $
-
---- dissipate2/udpmessagesocket.cpp.orig	2004-03-04 11:22:57.000000000 +0000
-+++ dissipate2/udpmessagesocket.cpp	2004-07-21 12:34:43.000000000 +0100
+--- dissipate2/udpmessagesocket.cpp.orig	2005-04-18 14:04:40.000000000 +0100
++++ dissipate2/udpmessagesocket.cpp	2005-11-24 16:49:55.000000000 +0000
 @@ -1,5 +1,7 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -10,12 +8,12 @@ $NetBSD: patch-ad,v 1.1 2004/07/21 21:49:02 scw Exp $
  #include <netinet/ip.h>
  #include <errno.h>
  #include <string.h>
-@@ -52,7 +54,7 @@
- 	socklen_t optlen;
- 	tos=IPTOS_PREC_CRITIC_ECP;
+@@ -57,7 +59,7 @@
+ 	tos=IPTOS_LOWDELAY;
+ #endif
  	optlen=1;
 -	if(setsockopt(socketfd,SOL_IP,IP_TOS,&tos,optlen) != 0){
 +	if(setsockopt(socketfd,IPPROTO_IP,IP_TOS,&tos,optlen) != 0){
  		perror("UDPMessageSocket::SetTOS");
+                 return -1 ;
  	}
- 	return 0;
diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af
index eadb8c190d2..b8d4d3135b4 100644
--- a/net/kphone/patches/patch-af
+++ b/net/kphone/patches/patch-af
@@ -1,9 +1,7 @@
-$NetBSD: patch-af,v 1.6 2005/05/26 21:01:07 tron Exp $
-
---- configure.orig	2004-12-07 13:16:23.000000000 +0100
-+++ configure	2005-05-26 22:38:17.000000000 +0200
-@@ -1262,8 +1262,8 @@
-   fi
+--- configure.orig	2005-06-22 09:37:20.000000000 +0100
++++ configure	2005-11-24 16:55:26.000000000 +0000
+@@ -1295,8 +1295,8 @@
+ 	echo "$ac_t""no" 1>&6
  fi
  
 -CFLAGS="-I$ac_cv_qt_inc -Wall"
@@ -13,16 +11,16 @@ $NetBSD: patch-af,v 1.6 2005/05/26 21:01:07 tron Exp $
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1538,7 +1538,7 @@
+@@ -1571,7 +1571,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lssl  $LIBS"
 +LIBS="-lssl -lcrypto $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1544 "configure"
+ #line 1577 "configure"
  #include "confdefs.h"
-@@ -2116,7 +2116,6 @@
+@@ -2149,7 +2149,6 @@
           CFLAGS="$CFLAGS -g -DDEBUG"
  echo "$ac_t""yes" 1>&6
  else
diff --git a/net/kphone/patches/patch-ag b/net/kphone/patches/patch-ag
index b505b0cc2ea..019e6bec278 100644
--- a/net/kphone/patches/patch-ag
+++ b/net/kphone/patches/patch-ag
@@ -1,7 +1,5 @@
-$NetBSD: patch-ag,v 1.4 2005/04/14 17:53:40 schwarz Exp $
-
---- kphone/Makefile.in.orig	Thu Apr  7 21:10:26 2005
-+++ kphone/Makefile.in	Thu Apr  7 21:11:15 2005
+--- kphone/Makefile.in.orig	2005-06-22 09:37:20.000000000 +0100
++++ kphone/Makefile.in	2005-11-24 16:59:45.000000000 +0000
 @@ -6,7 +6,7 @@
  SHARE_DIR=@datadir@/apps/kphone
  BIN_DIR=@bindir@
@@ -9,5 +7,5 @@ $NetBSD: patch-ag,v 1.4 2005/04/14 17:53:40 schwarz Exp $
 -MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"${prefix}/share/kphone/translations//\" 
 +MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"${prefix}/share/kphone/translations//\" -DDEVOSSAUDIO=\"$(DEVOSSAUDIO)\"
  
- CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)
- CXXFLAGS=$(CFLAGS)
+ ifeq (@ENABLE_SRTP@,yes)
+ CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)