6 files changed, 66 insertions, 36 deletions

diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 258300cbffc5..1e7b7c9bcce6 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -25,6 +25,12 @@ USE_ANT=	yes
 
 USE_ZIP=	yes
 
+USE_DOS2UNIX=	\
+org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java \
+com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
+com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
+
 NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
diff --git a/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
index bd9cdc48c8ee..580bb621d76c 100644
--- a/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
+++ b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
@@ -1,11 +1,20 @@
---- 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
+--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig	2008-06-03 11:20:58.000000000 -0400
++++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java	2008-06-03 11:23:02.000000000 -0400
 @@ -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.*;

- 

+  */
+ 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.*;
+ 
+@@ -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();
+ 
diff --git a/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
index 03716ba88c39..0e7893f724d9 100644
--- a/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
+++ b/net-p2p/azureus/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
@@ -1,10 +1,10 @@
---- 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
+--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig	2008-06-03 11:25:03.000000000 -0400
++++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java	2008-06-03 11:27:27.000000000 -0400
 @@ -139,6 +139,7 @@
- 						return false;

- 					}

- 				});

+ 						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"));
+ 
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 258300cbffc5..1e7b7c9bcce6 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -25,6 +25,12 @@ USE_ANT=	yes
 
 USE_ZIP=	yes
 
+USE_DOS2UNIX=	\
+org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java \
+com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
+com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
+
 NO_WRKSUBDIR=	yes
 
 JARFILE=	${PORTNAME}.jar
diff --git a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
index bd9cdc48c8ee..580bb621d76c 100644
--- a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
+++ b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__macosx__access__jnilib__OSXAccess.java
@@ -1,11 +1,20 @@
---- 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
+--- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java.orig	2008-06-03 11:20:58.000000000 -0400
++++ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java	2008-06-03 11:23:02.000000000 -0400
 @@ -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.*;

- 

+  */
+ 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.*;
+ 
+@@ -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();
+ 
diff --git a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
index 03716ba88c39..0e7893f724d9 100644
--- a/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
+++ b/net-p2p/vuze/files/patch-org__gudy__azureus2__platform__unix__ScriptBeforeStartup.java
@@ -1,10 +1,10 @@
---- 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
+--- org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java.orig	2008-06-03 11:25:03.000000000 -0400
++++ org/gudy/azureus2/platform/unix/ScriptBeforeStartup.java	2008-06-03 11:27:27.000000000 -0400
 @@ -139,6 +139,7 @@
- 						return false;

- 					}

- 				});

+ 						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"));
+