- Update to 1.4.1

PR:		136165
Submitted by:	John Prather <john.c.prather@gmail.com> (maintainer)

7 files changed, 28 insertions, 83 deletions

diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index 375b9acf5e06..6140090f8c69 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pidgin-sipe
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.0
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe
 
@@ -26,8 +26,7 @@ USE_GETTEXT=	yes
 CFLAGS+=	"-I/${LOCALBASE}/include"
 LIBS+=		"-L/${LOCALBASE}/lib"
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		LIBS="${LIBS}" \
+CONFIGURE_ENV+=	LIBS="${LIBS}" \
 		COM_ERR_CFLAGS="-I/usr/include" \
 		COM_ERR_LIBS="-L/usr/lib -lcom_err"
 
diff --git a/net-im/pidgin-sipe/distinfo b/net-im/pidgin-sipe/distinfo
index 553830667a94..229ab455913f 100644
--- a/net-im/pidgin-sipe/distinfo
+++ b/net-im/pidgin-sipe/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-sipe-1.4.1.tar.bz2) = d1300018eb74008a48e55653086f24e1
-SHA256 (pidgin-sipe-1.4.1.tar.bz2) = d613471b0d19441b162ea64679d7b2961a7d9d42f0007cf63400f04517f56f58
-SIZE (pidgin-sipe-1.4.1.tar.bz2) = 334875
+MD5 (pidgin-sipe-1.5.0.tar.bz2) = 8d27efe5d98d88385736d92d9aa0c924
+SHA256 (pidgin-sipe-1.5.0.tar.bz2) = 32747093d555de1cd1216d2c630b47102e251427d522f59820d5d67cdb731fd6
+SIZE (pidgin-sipe-1.5.0.tar.bz2) = 343652
diff --git a/net-im/pidgin-sipe/files/patch-src-sipe-sign.c b/net-im/pidgin-sipe/files/patch-src-sipe-sign.c
deleted file mode 100644
index 9433d0835111..000000000000
--- a/net-im/pidgin-sipe/files/patch-src-sipe-sign.c
+++ /dev/null
@@ -1,16 +0,0 @@
-*** src/sipe-sign.c.orig	Thu May  7 11:58:37 2009
---- src/sipe-sign.c	Thu May  7 11:59:03 2009
-***************
-*** 26,32 ****
---- 26,36 ----
-  #include <errno.h>
-  #include <ctype.h>
-  #ifndef _WIN32
-+ #ifdef __FreeBSD__
-+ #include <com_err.h>
-+ #else
-  #include <et/com_err.h>
-+ #endif
-  #else
-  #include <protocols/zephyr/com_err.h>
-  #include "internal.h"
diff --git a/net-im/pidgin-sipe/files/patch-src-sipe.c b/net-im/pidgin-sipe/files/patch-src-sipe.c
new file mode 100644
index 000000000000..d2ea4063c73c
--- /dev/null
+++ b/net-im/pidgin-sipe/files/patch-src-sipe.c
@@ -0,0 +1,19 @@
+*** src/sipe.c.orig	Thu Jul  2 11:08:31 2009
+--- src/sipe.c	Thu Jul  2 11:11:56 2009
+***************
+*** 2886,2892 ****
+  	while (tmp) {
+  		struct transaction *trans = tmp->data;
+  		tmp = tmp->next;
+! 		purple_debug_info("sipe", "have open transaction age: %ld\n", currtime-trans->time);
+  		if ((currtime - trans->time > 5) && trans->retries >= 1) {
+  			/* TODO 408 */
+  		} else {
+--- 2886,2892 ----
+  	while (tmp) {
+  		struct transaction *trans = tmp->data;
+  		tmp = tmp->next;
+! 		purple_debug_info("sipe", "have open transaction age: %ld\n", (long int)currtime-trans->time);
+  		if ((currtime - trans->time > 5) && trans->retries >= 1) {
+  			/* TODO 408 */
+  		} else {
diff --git a/net-im/pidgin-sipe/files/patch-src-sipkrb5.c b/net-im/pidgin-sipe/files/patch-src-sipkrb5.c
deleted file mode 100644
index 22e59a15f676..000000000000
--- a/net-im/pidgin-sipe/files/patch-src-sipkrb5.c
+++ /dev/null
@@ -1,17 +0,0 @@
-*** src/sipkrb5.c.orig	Thu May  7 11:58:42 2009
---- src/sipkrb5.c	Thu May  7 11:59:42 2009
-***************
-*** 35,41 ****
---- 35,46 ----
-  #include <string.h>
-  #include <errno.h>
-  #include <ctype.h>
-+ #ifdef __FreeBSD__
-+ #include <com_err.h>
-+ #else
-  #include <et/com_err.h>
-+ #endif
-+ 
-  
-  #include "debug.h"
-  #include "util.h"
diff --git a/net-im/pidgin-sipe/files/patch-src-uuid.c b/net-im/pidgin-sipe/files/patch-src-uuid.c
deleted file mode 100644
index 47901bc24e17..000000000000
--- a/net-im/pidgin-sipe/files/patch-src-uuid.c
+++ /dev/null
@@ -1,44 +0,0 @@
-*** src/uuid.c.orig	Sun May 17 19:09:00 2009
---- src/uuid.c	Mon May 18 13:43:53 2009
-***************
-*** 28,34 ****
---- 28,38 ----
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-+ #ifdef __FreeBSD__
-+ #include <net/if.h>
-+ #else
-  #include <linux/if.h>
-+ #endif
-  #else
-  #ifdef _DLL
-  #define _WS2TCPIP_H_
-***************
-*** 133,139 ****
---- 137,147 ----
-          strcpy(ifr.ifr_name, IFR->ifr_name);
-          if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0) {
-              if (! (ifr.ifr_flags & IFF_LOOPBACK)) {
-+ #ifdef __FreeBSD__
-+ 		if (ioctl(s, SIOCGIFMAC, &ifr) == 0) {
-+ #else
-                  if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0) {
-+ #endif
-                      ok = 1;
-                      break;
-                  }
-***************
-*** 143,149 ****
---- 151,161 ----
-  
-      close(s);
-      if (ok) {
-+ #ifdef __FreeBSD__
-+ 	memmove((void *)addr, ifr.ifr_ifru.ifru_addr.sa_data, 6);
-+ #else
-          memmove((void *)addr, ifr.ifr_hwaddr.sa_data, 6);
-+ #endif
-      }
-      else {
-          return -1;
diff --git a/net-im/pidgin-sipe/pkg-plist b/net-im/pidgin-sipe/pkg-plist
index cabe38050bff..5103ff281f40 100644
--- a/net-im/pidgin-sipe/pkg-plist
+++ b/net-im/pidgin-sipe/pkg-plist
@@ -1,10 +1,14 @@
 lib/pidgin/libsipe.la
 lib/pidgin/libsipe.so
+share/locale/cs/LC_MESSAGES/pidgin-sipe.mo
 share/locale/da/LC_MESSAGES/pidgin-sipe.mo
 share/locale/de/LC_MESSAGES/pidgin-sipe.mo
 share/locale/es/LC_MESSAGES/pidgin-sipe.mo
 share/locale/fr/LC_MESSAGES/pidgin-sipe.mo
 share/locale/hi/LC_MESSAGES/pidgin-sipe.mo
+share/locale/it/LC_MESSAGES/pidgin-sipe.mo
+share/locale/nb/LC_MESSAGES/pidgin-sipe.mo
+share/locale/ru/LC_MESSAGES/pidgin-sipe.mo
 share/locale/ta/LC_MESSAGES/pidgin-sipe.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin-sipe.mo
 share/pixmaps/pidgin/protocols/16/sipe.png