6 files changed, 32 insertions, 21 deletions

diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 864b04af2fb7..e4af695aa69c 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twinkle
-PORTVERSION=	0.9
-PORTREVISION=	2
+PORTVERSION=	1.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.xs4all.nl/~mfnboer/twinkle/download/
 
@@ -19,7 +18,7 @@ LIB_DEPENDS=	ccgnu2-1.5.0:${PORTSDIR}/devel/commoncpp \
 		ccrtp1-1.5.0:${PORTSDIR}/devel/ccrtp \
 		sndfile.1:${PORTSDIR}/audio/libsndfile \
 		boost_regex.3:${PORTSDIR}/devel/boost \
-		speex.1:${PORTSDIR}/audio/speex \
+		speex.3:${PORTSDIR}/audio/speex \
 		ilbc.0:${PORTSDIR}/net/ilbc \
 		zrtpcpp-0.9.0:${PORTSDIR}/devel/libzrtpcpp
 
@@ -41,9 +40,8 @@ QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile
-.endif
+post-patch:
+	${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}
diff --git a/net/twinkle/distinfo b/net/twinkle/distinfo
index 0848765b72ea..a1234ffd34a4 100644
--- a/net/twinkle/distinfo
+++ b/net/twinkle/distinfo
@@ -1,3 +1,3 @@
-MD5 (twinkle-0.9.tar.gz) = 74ef85e9f4570cec10bd23d301f5549e
-SHA256 (twinkle-0.9.tar.gz) = 22f536aaf6a7aa6870c31d03190b206509cfc8b6147c3af7080d6dbfa5a992b6
-SIZE (twinkle-0.9.tar.gz) = 1012524
+MD5 (twinkle-1.0.tar.gz) = 3180475a8eade9918bc1299dcbfe1fcc
+SHA256 (twinkle-1.0.tar.gz) = f3513deda4cf24f285d48538b2ccffca3ff2e936b942b71f30f7ac13896c58cc
+SIZE (twinkle-1.0.tar.gz) = 1172116
diff --git a/net/twinkle/files/patch-src-Makefile.in b/net/twinkle/files/patch-src-Makefile.in
deleted file mode 100644
index 259ca8d95bec..000000000000
--- a/net/twinkle/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-parser_parser.yxx b/net/twinkle/files/patch-src-parser_parser.yxx
index bfa5249d1126..e31804a45868 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	Sat Apr 22 20:47:06 2006
-+++ src/parser/parser.yxx	Sat Apr 22 20:47:30 2006
+--- src/parser/parser.yxx	Tue Jan  9 14:09:49 2007
++++ src/parser/parser.yxx	Sun Feb  4 17:44:31 2007
 @@ -48,7 +48,7 @@
  
  %union {
@@ -9,3 +9,12 @@
  	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
new file mode 100644
index 000000000000..87b9793016f7
--- /dev/null
+++ b/net/twinkle/files/patch-src_address_book.h
@@ -0,0 +1,11 @@
+--- 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 @@
+ #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/pkg-plist b/net/twinkle/pkg-plist
index 1c9aabe803d9..58bc2b146171 100644
--- a/net/twinkle/pkg-plist
+++ b/net/twinkle/pkg-plist
@@ -1,8 +1,11 @@
 bin/twinkle
+%%DATADIR%%/lang/twinkle_nl.qm
+%%DATADIR%%/lang/twinkle_de.qm
 %%DATADIR%%/providers.csv
 %%DATADIR%%/ringback.wav
 %%DATADIR%%/ringtone.wav
 %%DATADIR%%/twinkle16.png
 %%DATADIR%%/twinkle32.png
 %%DATADIR%%/twinkle48.png
+@dirrm %%DATADIR%%/lang
 @dirrm %%DATADIR%%