Updated kphone to 4.1.0 (approved by tron)

Changes from previous version 4.0.5 are:

* support for ALSA (not yet enabled in pkgsrc)
* support for jack (not yet enabled in pkgsrc)
* some bug fixes

6 files changed, 30 insertions, 36 deletions

diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index c539a20a5f5..dcd8bfcd28b 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/14 13:46:04 schwarz Exp $
 
-DISTNAME=		kphone-4.0.5
+DISTNAME=		kphone-4.1.0
 CATEGORIES=		net comms
 MASTER_SITES=		http://www.wirlab.net/kphone/
 
@@ -14,7 +14,7 @@ WRKSRC=			${WRKDIR}/kphone
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
-CONFIGURE_ENV=		QTDIR="${QTDIR}"
+CONFIGURE_ENV+=		QTDIR="${QTDIR}"
 
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
@@ -25,6 +25,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${PREFIX}/share/kphone/icons
 
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/net/kphone/distinfo b/net/kphone/distinfo
index ab748526584..0121f43efff 100644
--- a/net/kphone/distinfo
+++ b/net/kphone/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:13:51 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/04/14 13:46:04 schwarz Exp $
 
-SHA1 (kphone-4.0.5.tar.gz) = d4182d07b82555147481a65d3274620fa01a96ac
-RMD160 (kphone-4.0.5.tar.gz) = 59b8881951e22039106005f228c4674d1e02b294
-Size (kphone-4.0.5.tar.gz) = 258159 bytes
+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 (patch-aa) = ecb31fdeeaf4cb2a5aafe50b5fe58b85375cfd65
 SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31
 SHA1 (patch-ac) = 71ee825881b0a9135bdc4259c96a622e0c9cb268
 SHA1 (patch-ad) = 1017e963c72ac24b1b86f4c810222a8ee0583f33
-SHA1 (patch-ae) = 7f145e6d8e78a5fbbe2dfa780a7321013d123765
-SHA1 (patch-af) = c638706c5c5f853d80a225aa873a886868c6ffb4
-SHA1 (patch-ag) = 29879e04fc1525feeb3895f13c06e2808a348df5
+SHA1 (patch-ae) = 51309e4617216a986c922014b1117432aa45072e
+SHA1 (patch-af) = 6230f3355ccdb1c9639931614c9a1c94d0fa19ec
+SHA1 (patch-ag) = f9ac807d0603ac3da478522901b91b1ba732b45a
 SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7
-SHA1 (patch-ai) = 4e405c8d0db5617fb814776507308864ee698818
+SHA1 (patch-ai) = cc4ee4a582dbbcc8434889dcf15d21d49b03fed0
 SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936
diff --git a/net/kphone/patches/patch-ae b/net/kphone/patches/patch-ae
index 7358be59c4b..b982b3ef60c 100644
--- a/net/kphone/patches/patch-ae
+++ b/net/kphone/patches/patch-ae
@@ -1,8 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2004/11/13 18:33:44 tron Exp $
-
---- Makefile.in.orig	2004-11-13 19:12:23.000000000 +0100
-+++ Makefile.in	2004-11-13 19:13:07.000000000 +0100
-@@ -2,25 +2,25 @@
+--- Makefile.in.orig	Thu Apr  7 20:33:14 2005
++++ Makefile.in	Thu Apr  7 20:36:24 2005
+@@ -2,26 +2,26 @@
  SUBS	:=$(foreach sub,$(SUBDIRS), $(sub)/$(sub).a)
  
  all dep:
@@ -32,6 +30,7 @@ $NetBSD: patch-ae,v 1.2 2004/11/13 18:33:44 tron Exp $
  distclean:	clean
  	rm -f config.cache config.log config.status
  	rm -f Makefile
+ 	rm -f config.h
 -	@for T in $(SUBDIRS); do make -C $$T $@; done
 +	@for T in $(SUBDIRS); do $(MAKE) -C $$T $@; done
  	rm -f po/Makefile
diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af
index 51cb06ec7c2..3bd0506e917 100644
--- a/net/kphone/patches/patch-af
+++ b/net/kphone/patches/patch-af
@@ -1,17 +1,15 @@
-$NetBSD: patch-af,v 1.3 2004/11/13 18:33:44 tron Exp $
-
---- configure.orig	2004-10-11 10:04:28.000000000 +0200
-+++ configure	2004-11-13 19:28:05.000000000 +0100
-@@ -1238,7 +1238,7 @@
+--- configure.orig	Thu Apr  7 21:00:20 2005
++++ configure	Thu Apr  7 21:03:16 2005
+@@ -1263,7 +1263,7 @@
  fi
  
  CFLAGS="-I$ac_cv_qt_inc -Wall"
--LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib"
-+LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname $LIBOSSAUDIO -L/usr/X11R6/lib"
+-LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib64 -L/usr/X11R6/lib"
++LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname $LIBOSSAUDIO"
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1860,7 +1860,6 @@
+@@ -2116,7 +2116,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 de72fe28522..0b96c3020fb 100644
--- a/net/kphone/patches/patch-ag
+++ b/net/kphone/patches/patch-ag
@@ -1,13 +1,11 @@
-$NetBSD: patch-ag,v 1.2 2004/11/13 18:33:44 tron Exp $
-
---- kphone/Makefile.in.orig	2004-11-08 10:28:49.000000000 +0100
-+++ kphone/Makefile.in	2004-11-13 19:23:10.000000000 +0100
+--- kphone/Makefile.in.orig	Thu Apr  7 21:10:26 2005
++++ kphone/Makefile.in	Thu Apr  7 21:11:15 2005
 @@ -6,7 +6,7 @@
  SHARE_DIR=@datadir@/apps/kphone
  BIN_DIR=@bindir@
  
--MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"$(SHARE_DIR)/translations//\" 
-+MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"$(SHARE_DIR)/translations//\"  -DDEVOSSAUDIO=\"$(DEVOSSAUDIO)\"
+-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)
diff --git a/net/kphone/patches/patch-ai b/net/kphone/patches/patch-ai
index 994d6e95ee0..7d4e52fc14c 100644
--- a/net/kphone/patches/patch-ai
+++ b/net/kphone/patches/patch-ai
@@ -1,8 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2004/07/21 21:49:02 scw Exp $
-
---- kphone/callaudio.cpp.orig	2004-04-02 18:36:54.000000000 +0100
-+++ kphone/callaudio.cpp	2004-07-21 12:51:09.000000000 +0100
-@@ -65,7 +65,7 @@
+--- kphone/callaudio.cpp.orig	Thu Dec  9 10:08:32 2004
++++ kphone/callaudio.cpp	Thu Apr  7 21:13:13 2005
+@@ -93,7 +93,7 @@
  void CallAudio::setOSSFilename( const QString &devname )
  {
  	if( devname == QString::null ) {
@@ -11,7 +9,7 @@ $NetBSD: patch-ai,v 1.1 2004/07/21 21:49:02 scw Exp $
  	} else {
  		ossfilename = devname;
  	}
-@@ -74,7 +74,7 @@
+@@ -102,7 +102,7 @@
  void CallAudio::setOSSFilename2( const QString &devname )
  {
  	if( devname == QString::null ) {