From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 7 13:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B82D106567A for ; Mon, 7 Jul 2008 13:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E98B48FC22 for ; Mon, 7 Jul 2008 13:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m67DU1S7080110 for ; Mon, 7 Jul 2008 13:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m67DU1Ff080107; Mon, 7 Jul 2008 13:30:01 GMT (envelope-from gnats) Resent-Date: Mon, 7 Jul 2008 13:30:01 GMT Resent-Message-Id: <200807071330.m67DU1Ff080107@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kozienko Aleksandr Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 965E61065672 for ; Mon, 7 Jul 2008 13:21:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 831548FC18 for ; Mon, 7 Jul 2008 13:21:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m67DLjH0036267 for ; Mon, 7 Jul 2008 13:21:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m67DLjGS036266; Mon, 7 Jul 2008 13:21:45 GMT (envelope-from nobody) Message-Id: <200807071321.m67DLjGS036266@www.freebsd.org> Date: Mon, 7 Jul 2008 13:21:45 GMT From: Kozienko Aleksandr To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/125366: [UPDATE] net-im/trix :update from 0.93 to 0.94 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 13:30:02 -0000 >Number: 125366 >Category: ports >Synopsis: [UPDATE] net-im/trix :update from 0.93 to 0.94 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 07 13:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Kozienko Aleksandr >Release: FreeBSD 6.3 release >Organization: >Environment: >Description: Update from 0.93 to 0.94 version >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2008-06-06 16:51:53.000000000 +0300 +++ Makefile 2008-07-02 11:17:48.000000000 +0300 @@ -9 +9 @@ -PORTVERSION= 0.93 +PORTVERSION= 0.94 --- distinfo.orig 2008-06-03 16:19:57.000000000 +0300 +++ distinfo 2008-07-02 18:42:17.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (trix-0.93.tar.bz2) = ad60f8b608fb08f8738deab69e1880f1 -SHA256 (trix-0.93.tar.bz2) = cf9e2df926277b79227900817e289e8fcf242922b3f233bb7d037e95cb3a3dd4 -SIZE (trix-0.93.tar.bz2) = 1050048 +MD5 (trix-0.94.tar.bz2) = 0d49c6dd0e8d281062dfbbc43f92f91b +SHA256 (trix-0.94.tar.bz2) = 4ca2c49ebe0a422c0678212b2304b599c82542255fcf6add7efa548c7725ae5a +SIZE (trix-0.94.tar.bz2) = 1018173 --- files/patch-crypto.cpp.orig 2008-06-03 16:19:58.000000000 +0300 +++ files/patch-crypto.cpp 1970-01-01 03:00:00.000000000 +0300 @@ -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 - - PROV_ENUMALGS_EX aProvEnumAlgsEx[4][RSAENH_MAX_ENUMALGS+1] = --- files/patch-settings.cpp.orig 2008-06-03 16:19:58.000000000 +0300 +++ files/patch-settings.cpp 2008-07-02 18:34:39.000000000 +0300 @@ -1,24 +1,10 @@ ---- 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 - #include --#include -+#include - #include -+#include - #include - #include -- --#ifdef FREEBSD - #include --#include --#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 @@ -26,2 +12,3 @@ -+ def_playcmd = "/usr/local/bin/play"; - #endif +-#endif ++ ++ @@ -29,0 +17 @@ + def_snd[Sound::JoinChannel] = datapath + "snd/join.wav"; --- files/patch-xxxprotocol.cpp.orig 2008-06-03 16:19:58.000000000 +0300 +++ files/patch-xxxprotocol.cpp 2008-07-02 15:55:23.000000000 +0300 @@ -1,2 +1,2 @@ ---- 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,4 +8,5 @@ - #ifdef WIN32 - #include - #else -@@ -21,7 +22,7 @@ + #include + #include + #include +@@ -17,12 +18,11 @@ + #include @@ -13 +13,0 @@ - #endif @@ -20 +20,6 @@ -@@ -223,7 +224,7 @@ + #include +-#include + #include + #include + #include +@@ -207,7 +207,7 @@ @@ -24,2 +29,2 @@ --#if defined( FREEBSD ) -+#if defined( BSD ) +-#ifdef BSD ++#if defined ( BSD ) @@ -29 +34 @@ -@@ -265,7 +266,7 @@ +@@ -249,7 +249,7 @@ @@ -33,2 +38,2 @@ --#if defined( FREEBSD ) -+#if defined( BSD ) +-#ifdef BSD ++#if defined ( BSD ) --- files/patch-xxxprotocol.h.orig 2008-06-03 16:19:58.000000000 +0300 +++ files/patch-xxxprotocol.h 2008-07-02 15:52:13.000000000 +0300 @@ -1,12 +1,3 @@ ---- 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 - #ifdef WIN32 - #include - #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 @@ @@ -16,2 +7,2 @@ --#if defined( FREEBSD ) -+#if defined( BSD ) +-#ifdef BSD ++ @@ -19 +10,2 @@ - #endif +-#endif ++ @@ -20,0 +13,2 @@ + struct UserSpec { + char codec; --- pkg-plist.orig 2008-06-03 16:19:57.000000000 +0300 +++ pkg-plist 2008-07-02 18:41:55.000000000 +0300 @@ -115,0 +116 @@ +share/trix/tr/trix_sp.qm >Release-Note: >Audit-Trail: >Unformatted: