From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Mar 17 13:50:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5362216A420 for ; Fri, 17 Mar 2006 13:50:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C495743D46 for ; Fri, 17 Mar 2006 13:50:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2HDoEqe068505 for ; Fri, 17 Mar 2006 13:50:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2HDoEXg068504; Fri, 17 Mar 2006 13:50:14 GMT (envelope-from gnats) Resent-Date: Fri, 17 Mar 2006 13:50:14 GMT Resent-Message-Id: <200603171350.k2HDoEXg068504@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, "Mikhail T." Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 727D216A41F for ; Fri, 17 Mar 2006 13:40:53 +0000 (UTC) (envelope-from mi@aldan.algebra.com) Received: from aldan.algebra.com (aldan.algebra.com [216.254.65.224]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB7043D4C for ; Fri, 17 Mar 2006 13:40:52 +0000 (GMT) (envelope-from mi@aldan.algebra.com) Received: from aldan.algebra.com (aldan [127.0.0.1]) by aldan.algebra.com (8.13.4/8.13.4) with ESMTP id k2HDeoj7097929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 17 Mar 2006 08:40:51 -0500 (EST) (envelope-from mi@aldan.algebra.com) Received: (from mi@localhost) by aldan.algebra.com (8.13.4/8.13.4/Submit) id k2HDeoRt097928; Fri, 17 Mar 2006 08:40:50 -0500 (EST) (envelope-from mi) Message-Id: <200603171340.k2HDeoRt097928@aldan.algebra.com> Date: Fri, 17 Mar 2006 08:40:50 -0500 (EST) From: "Mikhail T." To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/94607: upgrade net-p2p/azureus 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: Fri, 17 Mar 2006 13:50:15 -0000 >Number: 94607 >Category: ports >Synopsis: upgrade net-p2p/azureus >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 17 13:50:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Mikhail T. >Release: FreeBSD 6.1-PRERELEASE amd64 >Organization: Virtual Estates, Inc. >Environment: >Description: The version 2.4.0.2 is now available and any running azureus of an older version will try to self-update to it. Also, the port STILL does not build on amd64, because it mandates Java-1.4 instead of 1.4+ (only jdk15 is available on amd64). A new patch -- files/patch-swt31 -- is required to allow compiling against x11-toolkits/swt31. As soon as swt32 becomes available, this patch can be removed. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-p2p/azureus/Makefile,v retrieving revision 1.31 diff -U2 -r1.31 Makefile --- Makefile 19 Feb 2006 08:44:52 -0000 1.31 +++ Makefile 17 Mar 2006 13:40:18 -0000 @@ -7,6 +7,5 @@ PORTNAME= azureus -PORTVERSION= 2.3.0.6 -PORTREVISION= 1 +PORTVERSION= 2.4.0.2 CATEGORIES= net-p2p java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -31,5 +30,5 @@ JAVA_BUILD= jdk JAVA_RUN= jdk -JAVA_VERSION= 1.4 +JAVA_VERSION= 1.4+ JAVA_OS= native USE_ANT= yes @@ -37,5 +36,9 @@ USE_ZIP= yes -USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java +USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \ + org/gudy/azureus2/ui/swt/Messages.java \ + org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java \ + org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \ + org/gudy/azureus2/ui/swt/views/TableView.java NO_WRKSUBDIR= yes Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-p2p/azureus/distinfo,v retrieving revision 1.8 diff -U2 -r1.8 distinfo --- distinfo 20 Feb 2006 02:31:13 -0000 1.8 +++ distinfo 17 Mar 2006 13:40:18 -0000 @@ -1,3 +1,3 @@ -MD5 (Azureus_2.3.0.6_source.zip) = d02357ee2917482fee1174a0dc549c5e -SHA256 (Azureus_2.3.0.6_source.zip) = 7244b8b379f6254d0adf3f43da240b415f982c496d63529a86eaf8e231ef120a -SIZE (Azureus_2.3.0.6_source.zip) = 4773566 +MD5 (Azureus_2.4.0.2_source.zip) = f79a2c3664fe26a21d208551bfac4b6f +SHA256 (Azureus_2.4.0.2_source.zip) = 3c25d6560110b64acf7b395950f1b9b2553a365215a0e3fb6bce3d2414147099 +SIZE (Azureus_2.4.0.2_source.zip) = 5188679 Index: files/patch-swt31 =================================================================== RCS file: files/patch-swt31 diff -N files/patch-swt31 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-swt31 17 Mar 2006 13:40:18 -0000 @@ -0,0 +1,76 @@ +This set of patches allows Azureus to build against the 3.1.x version +of SWT. When the 3.2.x is _released_ by Eclipse, and our x11-toolkits/swt31 +port is updated, this file can be removed from the Azureus port. + + -mi + +--- org/gudy/azureus2/ui/swt/Messages.java Fri Feb 10 00:08:06 2006 ++++ org/gudy/azureus2/ui/swt/Messages.java Tue Mar 14 11:00:05 2006 +@@ -218,5 +218,5 @@ + } + } +- } else if (widget instanceof TableColumn) { ++ } /* else if (widget instanceof TableColumn) { + String key = (String) widget.getData(); + if (key != null) { +@@ -236,4 +236,5 @@ + } + } ++*/ + } + +--- org/gudy/azureus2/ui/swt/views/TableView.java Fri Feb 10 00:07:52 2006 ++++ org/gudy/azureus2/ui/swt/views/TableView.java Tue Mar 14 11:03:38 2006 +@@ -2714,5 +2714,5 @@ + if (table == null || table.isDisposed()) + return; +- ++/* + try { + // can't use TableColumnCore.getPosition, because user may have moved +@@ -2733,4 +2733,5 @@ + // sWT < 3.2 doesn't have column indicaters + } ++*/ + } + +--- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java Fri Feb 10 00:08:06 2006 ++++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java Tue Mar 14 11:06:20 2006 +@@ -374,4 +374,5 @@ + public void widgetSelected(SelectionEvent e) { + boolean ascending = comparator.setField(table.indexOf(tc)); ++/* + try { + table.setSortColumn(tc); +@@ -380,4 +381,5 @@ + // Ignore Pre 3.0 + } ++*/ + Collections.sort(pluginIFs, comparator); + table.clearAll(); +--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java Thu Mar 16 14:04:50 2006 ++++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java Fri Mar 17 08:16:49 2006 +@@ -208,4 +208,5 @@ + // Create shell & widgets + shell = new Shell(display, SWT.ON_TOP); ++/* + if (USE_SWT32_BG_SET) { + try { +@@ -215,4 +216,5 @@ + } + } ++*/ + Utils.setShellIcon(shell); + +@@ -435,4 +437,5 @@ + + boolean bAlternateDrawing = true; ++/* + if (USE_SWT32_BG_SET) { + try { +@@ -442,4 +445,5 @@ + } + } ++*/ + + if (bAlternateDrawing) { >Release-Note: >Audit-Trail: >Unformatted: