- Update to 0.94

- Use datadir macro

PR:		ports/125366
Submitted by:	Kozienko Aleksandr <pascalamsg@gmail.com> (maintainer)

4 files changed, 41 insertions, 62 deletions

diff --git a/net-im/trix/files/patch-crypto.cpp b/net-im/trix/files/patch-crypto.cpp
deleted file mode 100644
index fd8745b38f2b..000000000000
--- a/net-im/trix/files/patch-crypto.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/crypto.cpp.orig		2008-01-04 18:25:54.000000000 +0200
-+++ src/crypto.cpp		2008-04-21 01:30:02.000000000 +0300
-@@ -1,4 +1,5 @@
- #include "crypto.h"
-+typedef unsigned int uint;
- //#include <iostream>
- 
- PROV_ENUMALGS_EX aProvEnumAlgsEx[4][RSAENH_MAX_ENUMALGS+1] =
diff --git a/net-im/trix/files/patch-settings.cpp b/net-im/trix/files/patch-settings.cpp
index 855a086dc30d..64fcbd1f07e3 100644
--- a/net-im/trix/files/patch-settings.cpp
+++ b/net-im/trix/files/patch-settings.cpp
@@ -1,29 +1,17 @@
---- src/settings.cpp.orig	2008-01-04 18:25:54.000000000 +0200
-+++ src/settings.cpp		2008-04-24 00:55:06.000000000 +0300
-@@ -8,15 +8,12 @@
- 
- #include <unistd.h>
- #include <sys/ioctl.h>
--#include <net/if.h>
-+#include <netinet/in.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <sys/types.h>
- #include <arpa/inet.h>
--
--#ifdef FREEBSD
- #include <net/route.h>
--#include <netinet/in.h>
--#endif
- 
- #endif
- 
-@@ -279,7 +276,7 @@
- #if defined ( WIN32 )    
-     def_playcmd = "";
- #else
+--- src/settings.cpp.orig	2008-06-29 20:24:50.000000000 +0300
++++ src/settings.cpp		2008-07-02 18:31:27.000000000 +0300
+@@ -143,11 +143,10 @@
+     def_downloadpath=QDir::homeDirPath();
+     def_awaylimit=1800;
+     def_autoupdateinterval = 300;
+-#ifdef BSD
++
+     def_playcmd="/usr/local/bin/play";
+-#else
 -    def_playcmd = "/usr/bin/aplay";
-+    def_playcmd = "/usr/local/bin/play";
- #endif
+-#endif
++
++
      def_snd[Sound::Chatline] = datapath + "snd/chatline.wav";
      def_snd[Sound::Beep] = datapath + "snd/beep.wav";
+     def_snd[Sound::JoinChannel] = datapath + "snd/join.wav";
diff --git a/net-im/trix/files/patch-xxxprotocol.cpp b/net-im/trix/files/patch-xxxprotocol.cpp
index 1da7cdd2d6ae..5ae9e5b6e333 100644
--- a/net-im/trix/files/patch-xxxprotocol.cpp
+++ b/net-im/trix/files/patch-xxxprotocol.cpp
@@ -1,37 +1,42 @@
---- src/xxxprotocol.cpp.orig	2008-01-04 18:25:54.000000000 +0200
-+++ src/xxxprotocol.cpp		2008-04-21 01:19:07.000000000 +0300
+--- src/xxxprotocol.cpp.orig	2008-06-29 19:17:33.000000000 +0100
++++ src/xxxprotocol.cpp		2008-07-02 13:20:41.000000000 +0100
 @@ -8,6 +8,7 @@
  #include <quuid.h>
  #include <qsocketnotifier.h>
  #include <qmessagebox.h>
 +#include <sys/param.h>
- #ifdef WIN32
- #include <winsock.h>
- #else
-@@ -21,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+@@ -17,12 +18,11 @@
+ #include <unistd.h>
  #include <fcntl.h>
- #endif
  
 -#ifdef FREEBSD
 +#ifdef BSD
  #include <err.h>
  #include <errno.h>
  #include <net/if.h>
-@@ -223,7 +224,7 @@
+ #include <sys/sysctl.h>
+-#include <sys/param.h>
+ #include <netinet/if_ether.h>
+ #include <net/route.h>
+ #include <net/if_dl.h>
+@@ -207,7 +207,7 @@
  QString XXXProtocol::getHWAddr(const QString& addr, const QString& iface)
  { 
      QString macaddr(tr("Unknown"));
--#if defined( FREEBSD )
-+#if defined( BSD )
+-#ifdef BSD
++#if defined ( BSD )
      struct sockaddr_inarp addr_inarp;
  
      bzero(&addr_inarp, sizeof(addr_inarp));
-@@ -265,7 +266,7 @@
+@@ -249,7 +249,7 @@
      return macaddr;
  }
  
--#if defined( FREEBSD )
-+#if defined( BSD )
+-#ifdef BSD
++#if defined ( BSD )
  struct sockaddr_dl * XXXProtocol::search(u_long addr)
  {
      int mib[6];
diff --git a/net-im/trix/files/patch-xxxprotocol.h b/net-im/trix/files/patch-xxxprotocol.h
index d7017cb289fb..abb171bf0183 100644
--- a/net-im/trix/files/patch-xxxprotocol.h
+++ b/net-im/trix/files/patch-xxxprotocol.h
@@ -1,20 +1,14 @@
---- src/xxxprotocol.h.orig	2008-01-04 18:25:54.000000000 +0200
-+++ src/xxxprotocol.h		2008-04-21 01:20:02.000000000 +0300
-@@ -4,7 +4,7 @@
- #include "global.h"
- #include "tcpsocket.h"
- #include "crypto.h"
--
-+#include <sys/param.h>
- #ifdef WIN32
- #include <winsock.h>
- #endif
-@@ -31,7 +31,7 @@
+--- src/xxxprotocol.h.orig	2008-06-29 18:29:01.000000000 +0100
++++ src/xxxprotocol.h		2008-07-02 13:17:12.000000000 +0100
+@@ -31,9 +31,9 @@
      uint port;
      int recvsd;		//UDP socket
      
--#if defined( FREEBSD )
-+#if defined( BSD )
+-#ifdef BSD
++
      struct sockaddr_dl *search(u_long addr);
- #endif
+-#endif
++
      
+     struct UserSpec {
+ 	char codec;