9 files changed, 133 insertions, 0 deletions

diff --git a/net/Makefile b/net/Makefile
index f00a1f7bed4f..2f5c43b5b296 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -780,6 +780,7 @@
     SUBDIR += ttt
     SUBDIR += tund
     SUBDIR += tvark
+    SUBDIR += twinkle
     SUBDIR += ucarp
     SUBDIR += udptunnel
     SUBDIR += ulxmlrpcpp
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
new file mode 100644
index 000000000000..1496eacc0781
--- /dev/null
+++ b/net/twinkle/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for:	twinkle
+# Date created:		2006-04-22
+# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	twinkle
+PORTVERSION=	0.8.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.xs4all.nl/~mfnboer/twinkle/download/
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT=	Soft phone for your VoIP communcations using the SIP protocol
+
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+LIB_DEPENDS=	ccgnu2-1.4.0:${PORTSDIR}/devel/commoncpp \
+		ccrtp1-1.4.0:${PORTSDIR}/devel/ccrtp \
+		sndfile.1:${PORTSDIR}/audio/libsndfile \
+		boost_regex.3:${PORTSDIR}/devel/boost \
+		speex.3:${PORTSDIR}/audio/speex
+
+USE_X_PREFIX=	yes
+USE_GCC=	3.4+
+GNU_CONFIGURE=	yes
+USE_BISON=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_QT_VER=	3
+
+CONFIGURE_ARGS=	--with-qt-dir=${LOCALBASE}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	QTDIR="${LOCALBASE}" \
+		QMAKESPEC="${QMAKESPEC}" \
+		CFLAGS="${CFLAGS}"
+MAKE_ENV=	QTDIR=${X11BASE}
+
+QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile
+.endif
+
+post-configure:
+	${REINPLACE_CMD} -e 's|-lresolv||g' ${WRKSRC}/src/gui/${MAKEFILE}
+
+.include <bsd.port.post.mk>
diff --git a/net/twinkle/distinfo b/net/twinkle/distinfo
new file mode 100644
index 000000000000..94a6552ea577
--- /dev/null
+++ b/net/twinkle/distinfo
@@ -0,0 +1,3 @@
+MD5 (twinkle-0.8.1.tar.gz) = 245ffd3b4a6f968d8f80d42f6aad079c
+SHA256 (twinkle-0.8.1.tar.gz) = a1d7df3f6e6ef758028f7f30982e434c513cce4ac4cd759d76dfd859a93bc3b3
+SIZE (twinkle-0.8.1.tar.gz) = 982496
diff --git a/net/twinkle/files/patch-src-Makefile.in b/net/twinkle/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..259ca8d95bec
--- /dev/null
+++ b/net/twinkle/files/patch-src-Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in	Sun Jul  9 09:09:32 2006
++++ src/Makefile.in	Wed Jul 12 12:45:18 2006
+@@ -338,7 +338,6 @@
+         $(top_builddir)/src/audits/libaudits.a\
+         $(top_builddir)/src/stun/libstun.a\
+ 	$(CCRTP_LIBS)\
+-	-lresolv\
+ 	-lsndfile\
+ 	-lboost_regex
+ 
diff --git a/net/twinkle/files/patch-src-call_script.cpp b/net/twinkle/files/patch-src-call_script.cpp
new file mode 100644
index 000000000000..cbbdfe1cffbb
--- /dev/null
+++ b/net/twinkle/files/patch-src-call_script.cpp
@@ -0,0 +1,33 @@
+--- src/call_script.cpp	Wed Jul 12 13:20:34 2006
++++ src/call_script.cpp	Wed Jul 12 13:23:34 2006
+@@ -46,6 +46,8 @@
+ #define SCR_TRIGGER_LOCAL_RELEASE	"local_release"
+ #define SCR_TRIGGER_REMOTE_RELEASE	"remote_release"
+ 
++extern char **environ;
++
+ /////////////////////////
+ // class t_script_result
+ /////////////////////////
+@@ -324,14 +326,16 @@
+ 		}
+ 		
+ 		char *line_buf = NULL;
+-		size_t line_buf_len = 0;
+-		ssize_t num_read;
++		char *num_read;
++		int line_buf_len;
++		int count=0;
+ 		
+ 		// Read and parse script results.
+-		while ((num_read = getline(&line_buf, &line_buf_len, fp_result)) != -1) {
++		while ((num_read = fgets(line_buf, sizeof(line_buf), fp_result)) != NULL) {
++			count++;
+ 			// Strip newline if present
+-			if (line_buf[num_read - 1] == '\n') {
+-				line_buf[num_read - 1] = 0;
++			if (line_buf[count - 1] == '\n') {
++				line_buf[count - 1] = 0;
+ 			}
+ 
+ 			// Convert the read line to a C++ string
diff --git a/net/twinkle/files/patch-src-parser_parser.yxx b/net/twinkle/files/patch-src-parser_parser.yxx
new file mode 100644
index 000000000000..bfa5249d1126
--- /dev/null
+++ b/net/twinkle/files/patch-src-parser_parser.yxx
@@ -0,0 +1,11 @@
+--- src/parser/parser.yxx	Sat Apr 22 20:47:06 2006
++++ src/parser/parser.yxx	Sat Apr 22 20:47:30 2006
+@@ -48,7 +48,7 @@
+ 
+ %union {
+ 	int			yyt_int;
+-	ulong			yyt_ulong;
++	u_long			yyt_ulong;
+ 	float			yyt_float;
+ 	string			*yyt_str;
+ 	t_parameter		*yyt_param;
diff --git a/net/twinkle/files/patch-src-threads_mutex.cpp b/net/twinkle/files/patch-src-threads_mutex.cpp
new file mode 100644
index 000000000000..eef9edb7e50f
--- /dev/null
+++ b/net/twinkle/files/patch-src-threads_mutex.cpp
@@ -0,0 +1,11 @@
+--- src/threads/mutex.cpp	Sat Apr 22 21:09:20 2006
++++ src/threads/mutex.cpp	Sat Apr 22 21:08:41 2006
+@@ -35,7 +35,7 @@
+ 	pthread_mutexattr_init(&attr);
+ 
+ 
+-	int ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
++	int ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ 	if (ret != 0) throw string(
+ 		"t_mutex::t_mutex failed to create a recursive mutex.");
+ 
diff --git a/net/twinkle/pkg-descr b/net/twinkle/pkg-descr
new file mode 100644
index 000000000000..c6ee949006a6
--- /dev/null
+++ b/net/twinkle/pkg-descr
@@ -0,0 +1,7 @@
+Twinkle is a soft phone for your voice over IP communcations using the SIP 
+protocol. 
+
+You can use it for direct IP phone to IP phone communication or in a network 
+using a SIP proxy to route your calls.
+
+WWW:	http://www.twinklephone.com/
diff --git a/net/twinkle/pkg-plist b/net/twinkle/pkg-plist
new file mode 100644
index 000000000000..1c9aabe803d9
--- /dev/null
+++ b/net/twinkle/pkg-plist
@@ -0,0 +1,8 @@
+bin/twinkle
+%%DATADIR%%/providers.csv
+%%DATADIR%%/ringback.wav
+%%DATADIR%%/ringtone.wav
+%%DATADIR%%/twinkle16.png
+%%DATADIR%%/twinkle32.png
+%%DATADIR%%/twinkle48.png
+@dirrm %%DATADIR%%