6 files changed, 45 insertions, 32 deletions

diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 2b6f8d9adc0f..d2a0bcad08d0 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twinkle
-PORTVERSION=	1.0
-PORTREVISION=	4
+PORTVERSION=	1.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~mfnboer/twinkle/download/
 
@@ -15,20 +14,21 @@ 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.5.0:${PORTSDIR}/devel/commoncpp \
-		ccrtp1-1.5.1:${PORTSDIR}/devel/ccrtp \
+LIB_DEPENDS=	ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp \
+		ccrtp1-1.6.0:${PORTSDIR}/devel/ccrtp \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		boost_regex.4:${PORTSDIR}/devel/boost \
 		speex.1:${PORTSDIR}/audio/speex \
 		ilbc.0:${PORTSDIR}/net/ilbc \
-		zrtpcpp-0.9.0:${PORTSDIR}/devel/libzrtpcpp
+		zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp
 
-USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_BISON=	build
 USE_GMAKE=	yes
+USE_GNOME=	libxml2
+USE_PERL5=	yes
 USE_XLIB=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_QT_VER=	3
 
 CONFIGURE_ARGS=	--with-qt-dir=${QT_PREFIX} QTDIR=${LOCALBASE}
@@ -36,15 +36,19 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" \
 		CFLAGS="${CFLAGS}"
 MAKE_ENV=	QTDIR=${QT_PREFIX}
+SUB_FILES=	pkg-message
 
 QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's|-lresolv||g' -e 's|-lbind||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lresolv||g' -e 's|-lbind||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-configure:
-	${REINPLACE_CMD} -e 's|-lresolv||g' ${WRKSRC}/src/gui/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|-lresolv||g' ${WRKSRC}/src/gui/${MAKEFILE}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net/twinkle/distinfo b/net/twinkle/distinfo
index a1234ffd34a4..d76a6d0eac79 100644
--- a/net/twinkle/distinfo
+++ b/net/twinkle/distinfo
@@ -1,3 +1,3 @@
-MD5 (twinkle-1.0.tar.gz) = 3180475a8eade9918bc1299dcbfe1fcc
-SHA256 (twinkle-1.0.tar.gz) = f3513deda4cf24f285d48538b2ccffca3ff2e936b942b71f30f7ac13896c58cc
-SIZE (twinkle-1.0.tar.gz) = 1172116
+MD5 (twinkle-1.1.tar.gz) = 40f8341a4a82c06d00bd1b326d9c6bbf
+SHA256 (twinkle-1.1.tar.gz) = 62df017d033670832beca97eca5eaf8ee6fe8dfe5d48ee137427745e2f09589f
+SIZE (twinkle-1.1.tar.gz) = 1372495
diff --git a/net/twinkle/files/patch-src-parser_parser.yxx b/net/twinkle/files/patch-src-parser_parser.yxx
index e31804a45868..e59c7a67aa4d 100644
--- a/net/twinkle/files/patch-src-parser_parser.yxx
+++ b/net/twinkle/files/patch-src-parser_parser.yxx
@@ -1,5 +1,5 @@
---- src/parser/parser.yxx	Tue Jan  9 14:09:49 2007
-+++ src/parser/parser.yxx	Sun Feb  4 17:44:31 2007
+--- src/parser/parser.yxx	2007-11-11 13:43:28.000000000 -0500
++++ src/parser/parser.yxx	2007-11-11 13:44:00.000000000 -0500
 @@ -48,7 +48,7 @@
  
  %union {
@@ -9,12 +9,3 @@
  	float			yyt_float;
  	string			*yyt_str;
  	t_parameter		*yyt_param;
-@@ -1520,6 +1520,8 @@
- 			MSG->hdr_refer_sub.set_extensions(*$2);
- 			MEMMAN_DELETE($1); delete $1;
- 			MEMMAN_DELETE($2); delete $2; }
-+
-+;
- 
- %%
- 
diff --git a/net/twinkle/files/patch-src_address_book.h b/net/twinkle/files/patch-src_address_book.h
index 87b9793016f7..4e180dd77d96 100644
--- a/net/twinkle/files/patch-src_address_book.h
+++ b/net/twinkle/files/patch-src_address_book.h
@@ -1,11 +1,12 @@
---- src/address_book.h	Sun Jan  7 02:47:33 2007
-+++ src/address_book.h	Sun Feb  4 17:40:26 2007
-@@ -25,6 +25,8 @@
+--- src/address_book.h	2007-11-11 13:35:53.000000000 -0500
++++ src/address_book.h	2007-11-11 13:36:25.000000000 -0500
+@@ -27,6 +27,9 @@
+ #include <string>
+ #include <list>
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
  #include "user.h"
  #include "sockets/url.h"
  #include "threads/mutex.h"
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- using namespace std;
- 
diff --git a/net/twinkle/files/pkg-message.in b/net/twinkle/files/pkg-message.in
new file mode 100644
index 000000000000..2c983e8d9ee1
--- /dev/null
+++ b/net/twinkle/files/pkg-message.in
@@ -0,0 +1,15 @@
+###############################################################################
+
+Twinkle SIP Softphone was installed
+
+1) If you are using a desktop/window manager different than KDE, you must to
+   disable tray icon system. Edit your ~/.twinkle/twinkle.sys file and change 
+   the following line:
+
+   # gui_use_systray=no
+
+   It avoids a crash when you run twinkle softphone
+
+2) Enjoy it ;)
+
+###############################################################################
diff --git a/net/twinkle/pkg-plist b/net/twinkle/pkg-plist
index 58bc2b146171..7897c1743581 100644
--- a/net/twinkle/pkg-plist
+++ b/net/twinkle/pkg-plist
@@ -1,6 +1,8 @@
 bin/twinkle
-%%DATADIR%%/lang/twinkle_nl.qm
+%%DATADIR%%/lang/twinkle_cs.qm 
 %%DATADIR%%/lang/twinkle_de.qm
+%%DATADIR%%/lang/twinkle_fr.qm
+%%DATADIR%%/lang/twinkle_nl.qm
 %%DATADIR%%/providers.csv
 %%DATADIR%%/ringback.wav
 %%DATADIR%%/ringtone.wav