aboutsummaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
authorErwin Lansing <erwin@FreeBSD.org>2007-01-04 20:00:06 +0000
committerErwin Lansing <erwin@FreeBSD.org>2007-01-04 20:00:06 +0000
commit7b565af856b342c5f4292c8a364b5cb43ab937ff (patch)
treead70cc57d1628d1f9038dce5e8fdd3ae438d1d3d /net-p2p
parent1ae2acbffba0b37a257efb49c34cd3a02864b4b7 (diff)
downloadports-7b565af856b342c5f4292c8a364b5cb43ab937ff.tar.gz
ports-7b565af856b342c5f4292c8a364b5cb43ab937ff.zip
Notes
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/azureus/Makefile26
-rw-r--r--net-p2p/azureus/files/azureus2
-rw-r--r--net-p2p/azureus/files/patch-swt31186
-rw-r--r--net-p2p/azureus/pkg-message4
-rw-r--r--net-p2p/azureus2/Makefile26
-rw-r--r--net-p2p/azureus2/files/azureus2
-rw-r--r--net-p2p/azureus2/files/patch-swt31186
-rw-r--r--net-p2p/azureus2/pkg-message4
-rw-r--r--net-p2p/vuze/Makefile26
-rw-r--r--net-p2p/vuze/files/azureus2
-rw-r--r--net-p2p/vuze/files/patch-swt31186
-rw-r--r--net-p2p/vuze/pkg-message4
12 files changed, 75 insertions, 579 deletions
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile
index 5fe3d3ded7d7..c61ba21551c2 100644
--- a/net-p2p/azureus/Makefile
+++ b/net-p2p/azureus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= azureus
PORTVERSION= 2.5.0.0
+PORTREVISION= 1
CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,10 +20,9 @@ BUILD_DEPENDS= \
${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \
${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda
RUN_DEPENDS= \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
ONLY_FOR_ARCHS= i386 amd64
@@ -41,11 +41,15 @@ USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
org/gudy/azureus2/ui/swt/views/TableView.java \
org/gudy/azureus2/ui/swt/Utils.java \
- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
+ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+
NO_WRKSUBDIR= yes
JARFILE= ${PORTNAME}.jar
+OPTIONS= SWTDEVEL "Use SWT Development port" off
+
# build classpath from BUILD_DEPENDS
MAKE_ENV= LANG=C
CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar}
@@ -60,7 +64,7 @@ do-configure:
-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-e "s|%%JARFILE%%|${JARFILE}|" \
- -e "s|%%SWTJAR%%|${JAVALIBDIR}/swt.jar|" \
+ -e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
do-install:
@@ -74,6 +78,20 @@ post-install:
.include <bsd.port.pre.mk>
+.if defined(WITH_SWTDEVEL)
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+SWT_JAR= swt-devel.jar
+.else
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+SWT_JAR= swt.jar
+.endif
+
CLASSPATH=.
.for jar in ${CLASSPATH_JARS}
CLASSPATH:=${CLASSPATH}:${jar}
diff --git a/net-p2p/azureus/files/azureus b/net-p2p/azureus/files/azureus
index ae536948e69a..6856237034b0 100644
--- a/net-p2p/azureus/files/azureus
+++ b/net-p2p/azureus/files/azureus
@@ -25,4 +25,4 @@ then
echo "LIB_PATH = ${LIB_PATH}"
fi
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/azureus/files/patch-swt31 b/net-p2p/azureus/files/patch-swt31
deleted file mode 100644
index 3db8d63cdc7d..000000000000
--- a/net-p2p/azureus/files/patch-swt31
+++ /dev/null
@@ -1,186 +0,0 @@
-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.
-
---- org/gudy/azureus2/ui/swt/Messages.java.orig Sun Sep 24 15:18:49 2006
-+++ org/gudy/azureus2/ui/swt/Messages.java Sun Sep 24 15:55:09 2006
-@@ -100,6 +100,7 @@
-
- // XXX We could (should?) send this event for all widget types
- // XXX Would it better to have a custom event type?
-+/*
- if (SWT.getVersion() > 3200) {
- Event event = new Event();
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-@@ -107,6 +108,7 @@
- event.widget = widget;
- widget.notifyListeners(SWT.Settings, event);
- }
-+*/
- }
- else if (widget instanceof Tree) {
- Tree tree = (Tree) widget;
-@@ -191,7 +193,7 @@
- Constants.isOSX ? "Cmd+" : "Ctrl+"));
- }
- }
-- } else if (widget instanceof TableColumn) {
-+ } /* else if (widget instanceof TableColumn) {
- String key = (String) widget.getData();
- if (key != null) {
- if (!key.endsWith(".info"))
-@@ -209,6 +211,7 @@
- }
- }
- }
-+*/
- }
-
-
---- org/gudy/azureus2/ui/swt/views/TableView.java.orig Sun Sep 24 15:23:49 2006
-+++ org/gudy/azureus2/ui/swt/views/TableView.java Sun Sep 24 16:04:17 2006
-@@ -631,6 +631,7 @@
- });
- }
-
-+/*
- if (Utils.SWT32_TABLEPAINT) {
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
- table.addListener(SWT.PaintItem, new Listener() {
-@@ -643,6 +644,7 @@
- }
- });
- }
-+*/
-
- // Deselect rows if user clicks on a black spot (a spot with no row)
- table.addMouseListener(new MouseAdapter() {
-@@ -816,6 +818,7 @@
-
- // we are sent a SWT.Settings event when the language changes and
- // when System fonts/colors change. In both cases, invalidate
-+/*
- if (SWT.getVersion() > 3200) {
- table.addListener(SWT.Settings, new Listener() {
- public void handleEvent(Event e) {
-@@ -823,6 +826,7 @@
- }
- });
- }
-+*/
-
- // XXX Disabled. We handle unset rows ourselves via table paints which
- // are more reliable.
-@@ -970,6 +974,7 @@
- }
-
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-+/*
- Rectangle cellBounds = item.getBounds(event.index);
-
- cellBounds.x += 3;
-@@ -1018,6 +1023,7 @@
- } catch (Exception e) {
- e.printStackTrace();
- }
-+*/
- }
-
- public void runDefaultAction() {
-@@ -3148,7 +3154,7 @@
- private void changeColumnIndicator() {
- if (table == null || table.isDisposed())
- return;
--
-+/*
- try {
- // can't use TableColumnCore.getPosition, because user may have moved
- // columns around, messing up the SWT column indexes.
-@@ -3167,6 +3173,7 @@
- } catch (NoSuchMethodError e) {
- // sWT < 3.2 doesn't have column indicaters
- }
-+*/
- }
-
- private void visibleRowsChanged() {
---- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.orig Sun Sep 24 15:28:27 2006
-+++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java Sun Sep 24 15:29:27 2006
-@@ -406,12 +406,14 @@
- tc.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean ascending = comparator.setField(table.indexOf(tc));
-+/*
- try {
- table.setSortColumn(tc);
- table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
- } catch (NoSuchMethodError ignore) {
- // Ignore Pre 3.0
- }
-+*/
- Collections.sort(pluginIFs, comparator);
- table.clearAll();
- }
---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig Sun Sep 24 15:32:29 2006
-+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java Sun Sep 24 15:59:32 2006
-@@ -64,7 +64,7 @@
- *
- */
- public class MessageSlideShell {
-- private static boolean USE_SWT32_BG_SET = true;
-+ private static boolean USE_SWT32_BG_SET = false;
-
- private static final boolean DEBUG = false;
-
-@@ -289,6 +289,7 @@
- if (shell == null) {
- shell = new Shell(display, style);
- }
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-@@ -298,6 +299,7 @@
- // ignore
- }
- }
-+*/
- Utils.setShellIcon(shell);
- shell.setText(popupParams.title);
-
-@@ -537,6 +539,7 @@
- gc.dispose();
-
- boolean bAlternateDrawing = true;
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundImage(imgBackground);
-@@ -544,7 +547,7 @@
- } catch (NoSuchMethodError e) {
- }
- }
--
-+*/
- if (bAlternateDrawing) {
- // Drawing of BG Image for pre SWT 3.2
-
-
---- org/gudy/azureus2/ui/swt/Utils.java.orig Sun Sep 24 16:24:39 2006
-+++ org/gudy/azureus2/ui/swt/Utils.java Sun Sep 24 16:25:05 2006
-@@ -680,6 +680,7 @@
- if (!table.isVisible() || iTopIndex >= itemCount)
- return -1;
-
-+/*
- if (Constants.isOSX) {
- try {
- TableItem item = table.getItem(iTopIndex);
-@@ -702,6 +703,7 @@
- table.getItemHeight()) + 1, table.getItemCount() - 1);
- }
- }
-+*/
-
- // getItem will return null if clientArea's height is smaller than
- // header height.
diff --git a/net-p2p/azureus/pkg-message b/net-p2p/azureus/pkg-message
index efdf17d4c8ce..5cb6f3adf3d8 100644
--- a/net-p2p/azureus/pkg-message
+++ b/net-p2p/azureus/pkg-message
@@ -7,8 +7,8 @@ Azureus, make sure you have the
latest version of all your installed
packages.
-For instance, make sure the swt31
-package is of version 3.1.1 or
+For instance, make sure the swt
+package is of version 3.2.1 or
later.
====================================
diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile
index 5fe3d3ded7d7..c61ba21551c2 100644
--- a/net-p2p/azureus2/Makefile
+++ b/net-p2p/azureus2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= azureus
PORTVERSION= 2.5.0.0
+PORTREVISION= 1
CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,10 +20,9 @@ BUILD_DEPENDS= \
${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \
${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda
RUN_DEPENDS= \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
ONLY_FOR_ARCHS= i386 amd64
@@ -41,11 +41,15 @@ USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
org/gudy/azureus2/ui/swt/views/TableView.java \
org/gudy/azureus2/ui/swt/Utils.java \
- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
+ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+
NO_WRKSUBDIR= yes
JARFILE= ${PORTNAME}.jar
+OPTIONS= SWTDEVEL "Use SWT Development port" off
+
# build classpath from BUILD_DEPENDS
MAKE_ENV= LANG=C
CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar}
@@ -60,7 +64,7 @@ do-configure:
-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-e "s|%%JARFILE%%|${JARFILE}|" \
- -e "s|%%SWTJAR%%|${JAVALIBDIR}/swt.jar|" \
+ -e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
do-install:
@@ -74,6 +78,20 @@ post-install:
.include <bsd.port.pre.mk>
+.if defined(WITH_SWTDEVEL)
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+SWT_JAR= swt-devel.jar
+.else
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+SWT_JAR= swt.jar
+.endif
+
CLASSPATH=.
.for jar in ${CLASSPATH_JARS}
CLASSPATH:=${CLASSPATH}:${jar}
diff --git a/net-p2p/azureus2/files/azureus b/net-p2p/azureus2/files/azureus
index ae536948e69a..6856237034b0 100644
--- a/net-p2p/azureus2/files/azureus
+++ b/net-p2p/azureus2/files/azureus
@@ -25,4 +25,4 @@ then
echo "LIB_PATH = ${LIB_PATH}"
fi
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/azureus2/files/patch-swt31 b/net-p2p/azureus2/files/patch-swt31
deleted file mode 100644
index 3db8d63cdc7d..000000000000
--- a/net-p2p/azureus2/files/patch-swt31
+++ /dev/null
@@ -1,186 +0,0 @@
-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.
-
---- org/gudy/azureus2/ui/swt/Messages.java.orig Sun Sep 24 15:18:49 2006
-+++ org/gudy/azureus2/ui/swt/Messages.java Sun Sep 24 15:55:09 2006
-@@ -100,6 +100,7 @@
-
- // XXX We could (should?) send this event for all widget types
- // XXX Would it better to have a custom event type?
-+/*
- if (SWT.getVersion() > 3200) {
- Event event = new Event();
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-@@ -107,6 +108,7 @@
- event.widget = widget;
- widget.notifyListeners(SWT.Settings, event);
- }
-+*/
- }
- else if (widget instanceof Tree) {
- Tree tree = (Tree) widget;
-@@ -191,7 +193,7 @@
- Constants.isOSX ? "Cmd+" : "Ctrl+"));
- }
- }
-- } else if (widget instanceof TableColumn) {
-+ } /* else if (widget instanceof TableColumn) {
- String key = (String) widget.getData();
- if (key != null) {
- if (!key.endsWith(".info"))
-@@ -209,6 +211,7 @@
- }
- }
- }
-+*/
- }
-
-
---- org/gudy/azureus2/ui/swt/views/TableView.java.orig Sun Sep 24 15:23:49 2006
-+++ org/gudy/azureus2/ui/swt/views/TableView.java Sun Sep 24 16:04:17 2006
-@@ -631,6 +631,7 @@
- });
- }
-
-+/*
- if (Utils.SWT32_TABLEPAINT) {
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
- table.addListener(SWT.PaintItem, new Listener() {
-@@ -643,6 +644,7 @@
- }
- });
- }
-+*/
-
- // Deselect rows if user clicks on a black spot (a spot with no row)
- table.addMouseListener(new MouseAdapter() {
-@@ -816,6 +818,7 @@
-
- // we are sent a SWT.Settings event when the language changes and
- // when System fonts/colors change. In both cases, invalidate
-+/*
- if (SWT.getVersion() > 3200) {
- table.addListener(SWT.Settings, new Listener() {
- public void handleEvent(Event e) {
-@@ -823,6 +826,7 @@
- }
- });
- }
-+*/
-
- // XXX Disabled. We handle unset rows ourselves via table paints which
- // are more reliable.
-@@ -970,6 +974,7 @@
- }
-
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-+/*
- Rectangle cellBounds = item.getBounds(event.index);
-
- cellBounds.x += 3;
-@@ -1018,6 +1023,7 @@
- } catch (Exception e) {
- e.printStackTrace();
- }
-+*/
- }
-
- public void runDefaultAction() {
-@@ -3148,7 +3154,7 @@
- private void changeColumnIndicator() {
- if (table == null || table.isDisposed())
- return;
--
-+/*
- try {
- // can't use TableColumnCore.getPosition, because user may have moved
- // columns around, messing up the SWT column indexes.
-@@ -3167,6 +3173,7 @@
- } catch (NoSuchMethodError e) {
- // sWT < 3.2 doesn't have column indicaters
- }
-+*/
- }
-
- private void visibleRowsChanged() {
---- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.orig Sun Sep 24 15:28:27 2006
-+++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java Sun Sep 24 15:29:27 2006
-@@ -406,12 +406,14 @@
- tc.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean ascending = comparator.setField(table.indexOf(tc));
-+/*
- try {
- table.setSortColumn(tc);
- table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
- } catch (NoSuchMethodError ignore) {
- // Ignore Pre 3.0
- }
-+*/
- Collections.sort(pluginIFs, comparator);
- table.clearAll();
- }
---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig Sun Sep 24 15:32:29 2006
-+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java Sun Sep 24 15:59:32 2006
-@@ -64,7 +64,7 @@
- *
- */
- public class MessageSlideShell {
-- private static boolean USE_SWT32_BG_SET = true;
-+ private static boolean USE_SWT32_BG_SET = false;
-
- private static final boolean DEBUG = false;
-
-@@ -289,6 +289,7 @@
- if (shell == null) {
- shell = new Shell(display, style);
- }
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-@@ -298,6 +299,7 @@
- // ignore
- }
- }
-+*/
- Utils.setShellIcon(shell);
- shell.setText(popupParams.title);
-
-@@ -537,6 +539,7 @@
- gc.dispose();
-
- boolean bAlternateDrawing = true;
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundImage(imgBackground);
-@@ -544,7 +547,7 @@
- } catch (NoSuchMethodError e) {
- }
- }
--
-+*/
- if (bAlternateDrawing) {
- // Drawing of BG Image for pre SWT 3.2
-
-
---- org/gudy/azureus2/ui/swt/Utils.java.orig Sun Sep 24 16:24:39 2006
-+++ org/gudy/azureus2/ui/swt/Utils.java Sun Sep 24 16:25:05 2006
-@@ -680,6 +680,7 @@
- if (!table.isVisible() || iTopIndex >= itemCount)
- return -1;
-
-+/*
- if (Constants.isOSX) {
- try {
- TableItem item = table.getItem(iTopIndex);
-@@ -702,6 +703,7 @@
- table.getItemHeight()) + 1, table.getItemCount() - 1);
- }
- }
-+*/
-
- // getItem will return null if clientArea's height is smaller than
- // header height.
diff --git a/net-p2p/azureus2/pkg-message b/net-p2p/azureus2/pkg-message
index efdf17d4c8ce..5cb6f3adf3d8 100644
--- a/net-p2p/azureus2/pkg-message
+++ b/net-p2p/azureus2/pkg-message
@@ -7,8 +7,8 @@ Azureus, make sure you have the
latest version of all your installed
packages.
-For instance, make sure the swt31
-package is of version 3.1.1 or
+For instance, make sure the swt
+package is of version 3.2.1 or
later.
====================================
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index 5fe3d3ded7d7..c61ba21551c2 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -7,6 +7,7 @@
PORTNAME= azureus
PORTVERSION= 2.5.0.0
+PORTREVISION= 1
CATEGORIES= net-p2p java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,10 +20,9 @@ BUILD_DEPENDS= \
${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
${JAVALIBDIR}/commons-cli.jar:${PORTSDIR}/java/jakarta-commons-cli \
${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31 \
${JAVALIBDIR}/seda.jar:${PORTSDIR}/net/seda
RUN_DEPENDS= \
- ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt31
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
ONLY_FOR_ARCHS= i386 amd64
@@ -41,11 +41,15 @@ USE_DOS2UNIX= org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java \
org/gudy/azureus2/ui/swt/views/TableView.java \
org/gudy/azureus2/ui/swt/Utils.java \
- org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
+ org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java \
+ com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java
+
NO_WRKSUBDIR= yes
JARFILE= ${PORTNAME}.jar
+OPTIONS= SWTDEVEL "Use SWT Development port" off
+
# build classpath from BUILD_DEPENDS
MAKE_ENV= LANG=C
CLASSPATH_JARS= ${BUILD_DEPENDS:C/:.+$//:M*.jar}
@@ -60,7 +64,7 @@ do-configure:
-e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \
-e "s|%%JAVA_OS%%|${JAVA_OS}|" \
-e "s|%%JARFILE%%|${JARFILE}|" \
- -e "s|%%SWTJAR%%|${JAVALIBDIR}/swt.jar|" \
+ -e "s|%%SWTJAR%%|${JAVALIBDIR}/${SWT_JAR}|" \
${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}
do-install:
@@ -74,6 +78,20 @@ post-install:
.include <bsd.port.pre.mk>
+.if defined(WITH_SWTDEVEL)
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+SWT_JAR= swt-devel.jar
+.else
+BUILD_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS+= \
+ ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt
+SWT_JAR= swt.jar
+.endif
+
CLASSPATH=.
.for jar in ${CLASSPATH_JARS}
CLASSPATH:=${CLASSPATH}:${jar}
diff --git a/net-p2p/vuze/files/azureus b/net-p2p/vuze/files/azureus
index ae536948e69a..6856237034b0 100644
--- a/net-p2p/vuze/files/azureus
+++ b/net-p2p/vuze/files/azureus
@@ -25,4 +25,4 @@ then
echo "LIB_PATH = ${LIB_PATH}"
fi
-exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
+exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=FreeBSD" "-Dazureus.config.path=${HOME}/.Azureus" "-Duser.dir=${HOME}/.Azureus" org.gudy.azureus2.ui.swt.Main "${@}"
diff --git a/net-p2p/vuze/files/patch-swt31 b/net-p2p/vuze/files/patch-swt31
deleted file mode 100644
index 3db8d63cdc7d..000000000000
--- a/net-p2p/vuze/files/patch-swt31
+++ /dev/null
@@ -1,186 +0,0 @@
-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.
-
---- org/gudy/azureus2/ui/swt/Messages.java.orig Sun Sep 24 15:18:49 2006
-+++ org/gudy/azureus2/ui/swt/Messages.java Sun Sep 24 15:55:09 2006
-@@ -100,6 +100,7 @@
-
- // XXX We could (should?) send this event for all widget types
- // XXX Would it better to have a custom event type?
-+/*
- if (SWT.getVersion() > 3200) {
- Event event = new Event();
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-@@ -107,6 +108,7 @@
- event.widget = widget;
- widget.notifyListeners(SWT.Settings, event);
- }
-+*/
- }
- else if (widget instanceof Tree) {
- Tree tree = (Tree) widget;
-@@ -191,7 +193,7 @@
- Constants.isOSX ? "Cmd+" : "Ctrl+"));
- }
- }
-- } else if (widget instanceof TableColumn) {
-+ } /* else if (widget instanceof TableColumn) {
- String key = (String) widget.getData();
- if (key != null) {
- if (!key.endsWith(".info"))
-@@ -209,6 +211,7 @@
- }
- }
- }
-+*/
- }
-
-
---- org/gudy/azureus2/ui/swt/views/TableView.java.orig Sun Sep 24 15:23:49 2006
-+++ org/gudy/azureus2/ui/swt/views/TableView.java Sun Sep 24 16:04:17 2006
-@@ -631,6 +631,7 @@
- });
- }
-
-+/*
- if (Utils.SWT32_TABLEPAINT) {
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
- table.addListener(SWT.PaintItem, new Listener() {
-@@ -643,6 +644,7 @@
- }
- });
- }
-+*/
-
- // Deselect rows if user clicks on a black spot (a spot with no row)
- table.addMouseListener(new MouseAdapter() {
-@@ -816,6 +818,7 @@
-
- // we are sent a SWT.Settings event when the language changes and
- // when System fonts/colors change. In both cases, invalidate
-+/*
- if (SWT.getVersion() > 3200) {
- table.addListener(SWT.Settings, new Listener() {
- public void handleEvent(Event e) {
-@@ -823,6 +826,7 @@
- }
- });
- }
-+*/
-
- // XXX Disabled. We handle unset rows ourselves via table paints which
- // are more reliable.
-@@ -970,6 +974,7 @@
- }
-
- // SWT 3.2 only. Code Ok -- Only called in SWT 3.2 mode
-+/*
- Rectangle cellBounds = item.getBounds(event.index);
-
- cellBounds.x += 3;
-@@ -1018,6 +1023,7 @@
- } catch (Exception e) {
- e.printStackTrace();
- }
-+*/
- }
-
- public void runDefaultAction() {
-@@ -3148,7 +3154,7 @@
- private void changeColumnIndicator() {
- if (table == null || table.isDisposed())
- return;
--
-+/*
- try {
- // can't use TableColumnCore.getPosition, because user may have moved
- // columns around, messing up the SWT column indexes.
-@@ -3167,6 +3173,7 @@
- } catch (NoSuchMethodError e) {
- // sWT < 3.2 doesn't have column indicaters
- }
-+*/
- }
-
- private void visibleRowsChanged() {
---- org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java.orig Sun Sep 24 15:28:27 2006
-+++ org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionPlugins.java Sun Sep 24 15:29:27 2006
-@@ -406,12 +406,14 @@
- tc.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean ascending = comparator.setField(table.indexOf(tc));
-+/*
- try {
- table.setSortColumn(tc);
- table.setSortDirection(ascending ? SWT.UP : SWT.DOWN);
- } catch (NoSuchMethodError ignore) {
- // Ignore Pre 3.0
- }
-+*/
- Collections.sort(pluginIFs, comparator);
- table.clearAll();
- }
---- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.orig Sun Sep 24 15:32:29 2006
-+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java Sun Sep 24 15:59:32 2006
-@@ -64,7 +64,7 @@
- *
- */
- public class MessageSlideShell {
-- private static boolean USE_SWT32_BG_SET = true;
-+ private static boolean USE_SWT32_BG_SET = false;
-
- private static final boolean DEBUG = false;
-
-@@ -289,6 +289,7 @@
- if (shell == null) {
- shell = new Shell(display, style);
- }
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-@@ -298,6 +299,7 @@
- // ignore
- }
- }
-+*/
- Utils.setShellIcon(shell);
- shell.setText(popupParams.title);
-
-@@ -537,6 +539,7 @@
- gc.dispose();
-
- boolean bAlternateDrawing = true;
-+/*
- if (USE_SWT32_BG_SET) {
- try {
- shell.setBackgroundImage(imgBackground);
-@@ -544,7 +547,7 @@
- } catch (NoSuchMethodError e) {
- }
- }
--
-+*/
- if (bAlternateDrawing) {
- // Drawing of BG Image for pre SWT 3.2
-
-
---- org/gudy/azureus2/ui/swt/Utils.java.orig Sun Sep 24 16:24:39 2006
-+++ org/gudy/azureus2/ui/swt/Utils.java Sun Sep 24 16:25:05 2006
-@@ -680,6 +680,7 @@
- if (!table.isVisible() || iTopIndex >= itemCount)
- return -1;
-
-+/*
- if (Constants.isOSX) {
- try {
- TableItem item = table.getItem(iTopIndex);
-@@ -702,6 +703,7 @@
- table.getItemHeight()) + 1, table.getItemCount() - 1);
- }
- }
-+*/
-
- // getItem will return null if clientArea's height is smaller than
- // header height.
diff --git a/net-p2p/vuze/pkg-message b/net-p2p/vuze/pkg-message
index efdf17d4c8ce..5cb6f3adf3d8 100644
--- a/net-p2p/vuze/pkg-message
+++ b/net-p2p/vuze/pkg-message
@@ -7,8 +7,8 @@ Azureus, make sure you have the
latest version of all your installed
packages.
-For instance, make sure the swt31
-package is of version 3.1.1 or
+For instance, make sure the swt
+package is of version 3.2.1 or
later.
====================================