kphone uses lrelease from qt3-tools, so depend on it and change Makefile

to not expect it in PATH. Add DragonFly support and don't try to link
with libresolv on DragonFly.

5 files changed, 43 insertions, 13 deletions

diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index b8f31ece58e..7ac49939474 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:46 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/22 01:31:43 joerg Exp $
 
 DISTNAME=		kphone-4.2
 CATEGORIES=		net comms
@@ -38,6 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/*.png ${PREFIX}/share/kphone/icons
 
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/kphone/distinfo b/net/kphone/distinfo
index 94144403223..31f37cb01b4 100644
--- a/net/kphone/distinfo
+++ b/net/kphone/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.9 2005/12/05 20:50:46 rillig Exp $
+$NetBSD: distinfo,v 1.10 2006/01/22 01:31:43 joerg Exp $
 
 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) = 9182af58e48cb20df9c353da2384f69c9ef71a85
+SHA1 (patch-ac) = fb85e2517a603a1f5432ab4296d239d1373dd9fb
 SHA1 (patch-ad) = ad4e7244e35dc0292e5afa7c9119aee02ce85052
 SHA1 (patch-ae) = 9d92b2585f673c7275a153f41c72623ad08b0b78
 SHA1 (patch-af) = 8b6d80d870d73a75e5060faaed3254d4317d6c33
-SHA1 (patch-ag) = cc2d220da55b7657452a97f2c3b442f0f6939848
+SHA1 (patch-ag) = 178908dab7d18a3fe45cdba250a8288bf7c75832
 SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7
 SHA1 (patch-ai) = bba9c0f8ab9c34e65b43e283e4d29e78aecd642c
 SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936
+SHA1 (patch-ak) = 4c3f498fe64df8dfbb5a93210d3eda8ac08c1f84
diff --git a/net/kphone/patches/patch-ac b/net/kphone/patches/patch-ac
index 5816e2f996c..0e9cd04d917 100644
--- a/net/kphone/patches/patch-ac
+++ b/net/kphone/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2006/01/22 01:31:43 joerg Exp $
 
 --- dissipate2/siputil.cpp.orig	2005-06-21 12:14:49.000000000 +0100
 +++ dissipate2/siputil.cpp	2005-11-24 16:47:03.000000000 +0000
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
  #include <sys/time.h>
  #include <sys/errno.h>
  #include <sys/ioctl.h>
-+#if defined (__FreeBSD__) || defined(__NetBSD__)
++#if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +#include <ifaddrs.h>
 +#endif
  #include <net/if_arp.h>
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
  {
 -	int sock, err, if_count, i, j = 0;
 +	int if_count, i, j = 0;
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
 +        int sock, err;
  	struct ifconf netconf;
  	char buffer[32*MAX_IF];
@@ -73,7 +73,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
 +	char if_name[MAX_IF][21];
 +	char if_addr[MAX_IF][21];
  	char *default_ifName;
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +        struct ifaddrs *ifp, *oifp;
 +        
 +        if(getifaddrs(&ifp) < 0 )
@@ -95,7 +95,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
 +        }
 +        if (oifp != NULL) freeifaddrs(oifp);
 +
-+#else /* not FreeBSD or NetBSD */
++#else /* not FreeBSD or NetBSD or DragonFly */
  	netconf.ifc_len = 32 * MAX_IF;
  	netconf.ifc_buf = buffer;
  	sock=socket( PF_INET, SOCK_DGRAM, 0 );
@@ -107,7 +107,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
  	printf( "Found %i interfaces.\n", if_count );
  
  //#test
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  	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 );
@@ -115,7 +115,7 @@ $NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $
  			}
  		}
  	}
-+#endif /* not FreeBSD or NetBSD */
++#endif /* not FreeBSD or NetBSD or DragonFly */
 +
  	if( j == 1 ) {
  		dissipate_our_fqdn = strdup( if_addr[0] );
diff --git a/net/kphone/patches/patch-ag b/net/kphone/patches/patch-ag
index a92119f8cf3..e8d972a375e 100644
--- a/net/kphone/patches/patch-ag
+++ b/net/kphone/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2005/12/05 20:50:46 rillig Exp $
+$NetBSD: patch-ag,v 1.7 2006/01/22 01:31:43 joerg Exp $
 
 --- 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 @@
+@@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
  SHARE_DIR=@datadir@/apps/kphone
  BIN_DIR=@bindir@
  
@@ -11,3 +11,18 @@ $NetBSD: patch-ag,v 1.6 2005/12/05 20:50:46 rillig Exp $
  
  ifeq (@ENABLE_SRTP@,yes)
  CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)
+@@ -15,9 +15,12 @@ CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -
+ endif
+ CXXFLAGS=$(CFLAGS)
+ ifeq (@ENABLE_SRTP@,yes)
+-LIBS=@LIBS@ -lssl -lcrypto -lresolv -lsrtp @LIBJACK@ @LIBALSA@
++LIBS=@LIBS@ -lssl -lcrypto -lsrtp @LIBJACK@ @LIBALSA@
+ else
+-LIBS=@LIBS@ -lssl -lcrypto -lresolv @LIBJACK@ @LIBALSA@
++LIBS=@LIBS@ -lssl -lcrypto @LIBJACK@ @LIBALSA@
++endif
++ifneq (${OPSYS},DragonFly)
++LIBS+= -lresolv
+ endif
+ LDFLAGS=@LDFLAGS@ -g
+ 
diff --git a/net/kphone/patches/patch-ak b/net/kphone/patches/patch-ak
new file mode 100644
index 00000000000..0e41d9e1ce8
--- /dev/null
+++ b/net/kphone/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2006/01/22 01:31:43 joerg Exp $
+
+--- po/Makefile.in.orig	2006-01-22 01:06:33.000000000 +0000
++++ po/Makefile.in
+@@ -11,7 +11,7 @@ QM=$(TS:.ts=.qm)
+ .SUFFIXES:.ts .qm
+ 
+ .ts.qm:
+-	lrelease $<
++	${QTDIR}/bin/lrelease $<
+ 
+ all: $(QM)
+