- Update to 3.0.5.2

PR:		124110
Submitted by:	Robert Noland <rnoland@2hip.net> (maintainer)
This commit is contained in:
Martin Wilke 2008-05-30 14:26:42 +00:00
parent 2acdc63252
commit 32e36ff484
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=213945
14 changed files with 78 additions and 106 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= azureus
PORTVERSION= 3.0.5.0
PORTVERSION= 3.0.5.2
CATEGORIES= net-p2p java
MASTER_SITES= SF
DISTNAME= Azureus_${PORTVERSION}_source
@ -72,7 +72,8 @@ RUN_DEPENDS+= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
# Use at your own risk, I've just had it around and decided to share.
.if defined(WITH_EXTRAHACK)
EXTRA_PATCHES+= \
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java \
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterTransparent.java
.endif
CLASSPATH=.

View file

@ -1,3 +1,3 @@
MD5 (Azureus_3.0.5.0_source.zip) = 0968e8017b69286d0a8435494e56757c
SHA256 (Azureus_3.0.5.0_source.zip) = 2e8ae56adc4d8341bbec722b224e0885c9ca5c49c996f2bc3c0b1f01fe788ca1
SIZE (Azureus_3.0.5.0_source.zip) = 7387408
MD5 (Azureus_3.0.5.2_source.zip) = 064b885fafd89c8a5042a3d6641d5318
SHA256 (Azureus_3.0.5.2_source.zip) = 43bb6a69d53ac00a446ccb706ff60d53f65dfffb4c22ab6c69c1851cbdfc8477
SIZE (Azureus_3.0.5.2_source.zip) = 7537643

View file

@ -1,6 +1,6 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig Sat Feb 3 18:34:39 2007
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java Sat Feb 3 18:37:03 2007
@@ -55,7 +55,7 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig 2007-03-01 23:39:40.000000000 -0500
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java 2008-05-29 13:45:17.000000000 -0400
@@ -57,7 +57,7 @@
public boolean
hasBufferedRead()
{

View file

@ -0,0 +1,11 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java.orig 2008-05-29 14:05:20.000000000 -0400
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java 2008-05-29 14:08:25.000000000 -0400
@@ -60,7 +60,7 @@
public boolean
hasBufferedRead()
{
- return( read_insert != null && read_insert.remaining() > 0 );
+ return( true );
}
public long

View file

@ -1,17 +0,0 @@
--- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Fri Dec 12 09:56:48 2003
+++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Sat Jun 11 16:06:40 2005
@@ -41,5 +41,5 @@
TransferData[] data = event.dataTypes;
for (int i = 0; i < data.length; i++) {
- int id = data[i].type;
+ long id = data[i].type;
String name = getNameFromId(id);
System.out.println("Data type is " + id + " " + name);
@@ -97,5 +97,5 @@
return ids;
}
- static String getNameFromId(int id) {
+ static String getNameFromId(long id) {
- switch (id) {
+ switch ((int)id) {
case 1 :

View file

@ -1,20 +1,11 @@
--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig Sun Sep 24 16:18:49 2006
+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java Sun Sep 24 16:19:07 2006
--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig 2007-03-07 16:49:08.000000000 +0100
+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java 2008-05-30 16:19:10.000000000 +0200
@@ -19,7 +19,7 @@
*/
package org.gudy.azureus2.platform.macosx.access.jnilib;
-import org.eclipse.swt.internal.carbon.AEDesc;
+// import org.eclipse.swt.internal.carbon.AEDesc;
import org.gudy.azureus2.core3.util.Debug;
@@ -42,7 +42,7 @@
}
}
- public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
+// public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
public static final native String getVersion();
*/
package org.gudy.azureus2.platform.macosx.access.jnilib;
-import org.eclipse.swt.internal.carbon.AEDesc;
+//import org.eclipse.swt.internal.carbon.AEDesc;
import org.gudy.azureus2.core3.util.*;

View file

@ -1,10 +1,10 @@
--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig 2007-10-13 16:57:39.000000000 -0400
+++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java 2007-10-13 16:58:03.000000000 -0400
@@ -136,6 +136,7 @@
return false;
}
});
--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig 2007-12-06 16:43:38.000000000 +0100
+++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java 2008-05-30 16:21:32.000000000 +0200
@@ -139,6 +139,7 @@
return false;
}
});
+ possibleDirs.add(new File("/usr/local/lib"));
possibleDirs.add(new File("/usr/local"));
possibleDirs.add(new File("/opt"));
possibleDirs.add(new File("/usr/local"));
possibleDirs.add(new File("/opt"));

View file

@ -6,7 +6,7 @@
#
PORTNAME= azureus
PORTVERSION= 3.0.5.0
PORTVERSION= 3.0.5.2
CATEGORIES= net-p2p java
MASTER_SITES= SF
DISTNAME= Azureus_${PORTVERSION}_source
@ -72,7 +72,8 @@ RUN_DEPENDS+= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
# Use at your own risk, I've just had it around and decided to share.
.if defined(WITH_EXTRAHACK)
EXTRA_PATCHES+= \
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterStream.java \
${PATCHDIR}/extra-patch-com__aelitis__azureus__core__networkmanager__impl__TransportHelperFilterTransparent.java
.endif
CLASSPATH=.

View file

@ -1,3 +1,3 @@
MD5 (Azureus_3.0.5.0_source.zip) = 0968e8017b69286d0a8435494e56757c
SHA256 (Azureus_3.0.5.0_source.zip) = 2e8ae56adc4d8341bbec722b224e0885c9ca5c49c996f2bc3c0b1f01fe788ca1
SIZE (Azureus_3.0.5.0_source.zip) = 7387408
MD5 (Azureus_3.0.5.2_source.zip) = 064b885fafd89c8a5042a3d6641d5318
SHA256 (Azureus_3.0.5.2_source.zip) = 43bb6a69d53ac00a446ccb706ff60d53f65dfffb4c22ab6c69c1851cbdfc8477
SIZE (Azureus_3.0.5.2_source.zip) = 7537643

View file

@ -1,6 +1,6 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig Sat Feb 3 18:34:39 2007
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java Sat Feb 3 18:37:03 2007
@@ -55,7 +55,7 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java.orig 2007-03-01 23:39:40.000000000 -0500
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java 2008-05-29 13:45:17.000000000 -0400
@@ -57,7 +57,7 @@
public boolean
hasBufferedRead()
{

View file

@ -0,0 +1,11 @@
--- com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java.orig 2008-05-29 14:05:20.000000000 -0400
+++ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java 2008-05-29 14:08:25.000000000 -0400
@@ -60,7 +60,7 @@
public boolean
hasBufferedRead()
{
- return( read_insert != null && read_insert.remaining() > 0 );
+ return( true );
}
public long

View file

@ -1,17 +0,0 @@
--- org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Fri Dec 12 09:56:48 2003
+++ org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java Sat Jun 11 16:06:40 2005
@@ -41,5 +41,5 @@
TransferData[] data = event.dataTypes;
for (int i = 0; i < data.length; i++) {
- int id = data[i].type;
+ long id = data[i].type;
String name = getNameFromId(id);
System.out.println("Data type is " + id + " " + name);
@@ -97,5 +97,5 @@
return ids;
}
- static String getNameFromId(int id) {
+ static String getNameFromId(long id) {
- switch (id) {
+ switch ((int)id) {
case 1 :

View file

@ -1,20 +1,11 @@
--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig Sun Sep 24 16:18:49 2006
+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java Sun Sep 24 16:19:07 2006
--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig 2007-03-07 16:49:08.000000000 +0100
+++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java 2008-05-30 16:19:10.000000000 +0200
@@ -19,7 +19,7 @@
*/
package org.gudy.azureus2.platform.macosx.access.jnilib;
-import org.eclipse.swt.internal.carbon.AEDesc;
+// import org.eclipse.swt.internal.carbon.AEDesc;
import org.gudy.azureus2.core3.util.Debug;
@@ -42,7 +42,7 @@
}
}
- public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
+// public static final native int AEGetParamDesc(int theAppleEvent, int theAEKeyword, int desiredType, AEDesc result);
public static final native String getVersion();
*/
package org.gudy.azureus2.platform.macosx.access.jnilib;
-import org.eclipse.swt.internal.carbon.AEDesc;
+//import org.eclipse.swt.internal.carbon.AEDesc;
import org.gudy.azureus2.core3.util.*;

View file

@ -1,10 +1,10 @@
--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig 2007-10-13 16:57:39.000000000 -0400
+++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java 2007-10-13 16:58:03.000000000 -0400
@@ -136,6 +136,7 @@
return false;
}
});
--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig 2007-12-06 16:43:38.000000000 +0100
+++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java 2008-05-30 16:21:32.000000000 +0200
@@ -139,6 +139,7 @@
return false;
}
});
+ possibleDirs.add(new File("/usr/local/lib"));
possibleDirs.add(new File("/usr/local"));
possibleDirs.add(new File("/opt"));
possibleDirs.add(new File("/usr/local"));
possibleDirs.add(new File("/opt"));