7 files changed, 251 insertions, 156 deletions

diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 34ebb2c38368..8d7a17b4857f 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -6,31 +6,28 @@
 #
 
 PORTNAME=	swt-devel
-DISTVERSION=	3.5M6
-PORTREVISION=	1
+DISTVERSION=	3.6M3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	S-${DISTVERSION}-200903130100
+MASTER_SITE_SUBDIR=	S-${DISTVERSION}-200910301201
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
 MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Standard Widget Toolkit for Java
 
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64 ppc
 
-SWT_VERSION=	3536
+SWT_VERSION=	3617
 OUTPUT_JAR=	swt-devel.jar
 
 USE_ZIP=	yes
 USE_GL=		yes
 USE_GNOME=	gtk20 pkgconfig
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_ANT=	yes
-MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
-MAKEFILE=	make_freebsd.mak
 USE_LDCONFIG=	yes
 PLIST_SUB=	BUILD=${SWT_VERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/${OUTPUT_JAR} \
@@ -61,16 +58,20 @@ MAKE_GNOME=	make_gnome
 .endif
 
 .if defined(WITH_BROWSER)
-USE_GECKO=	xulrunner firefox mozilla
-PLIST_FILES+=	lib/libswt-mozilla-gtk-%%BUILD%%.so
+USE_GECKO=	libxul
+PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
+MAKE_MOZILLA=	make_xulrunner
 .endif
 
 MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
 		MAKE_GNOME=${MAKE_GNOME} \
-		GECKO=${GECKO}
+		MAKE_MOZILLA=${MAKE_MOZILLA} \
+		JAVA_HOME=${JAVA_HOME}
 
 .if (${ARCH} == "amd64")
 DIST_EXT=	gtk-linux-x86_64
+.elif (${ARCH} == "ppc")
+DIST_EXT=	gtk-linux-ppc
 .else
 DIST_EXT=	gtk-linux-x86
 .endif
@@ -79,6 +80,11 @@ post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
 	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
 
+post-patch:
+	@${SED} -E -e 's|%%ARCH%%|${ARCH}|' \
+		-e 's|%%OUTPUT_JAR%%|${OUTPUT_JAR}|' \
+		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
+
 do-install:
 	${MKDIR} ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/libswt-*.so ${PREFIX}/lib
diff --git a/x11-toolkits/swt-devel/distinfo b/x11-toolkits/swt-devel/distinfo
index 6a7e061e5789..9bed13d530ca 100644
--- a/x11-toolkits/swt-devel/distinfo
+++ b/x11-toolkits/swt-devel/distinfo
@@ -1,6 +1,9 @@
-MD5 (swt-3.5M6-gtk-linux-x86.zip) = baddf47aeaafb342b932a509d742e406
-SHA256 (swt-3.5M6-gtk-linux-x86.zip) = d0e5873222fdd6f3062205429f9d8bf0f7345f6486ff730e32877f60f5bfcaf9
-SIZE (swt-3.5M6-gtk-linux-x86.zip) = 4732013
-MD5 (swt-3.5M6-gtk-linux-x86_64.zip) = 5a941039a7e52ca4d1929095422eb3a8
-SHA256 (swt-3.5M6-gtk-linux-x86_64.zip) = da04ab5e2a18d8e87001fe0a12d83d6bb795ae9d2d34bd47920fac8d1de168d9
-SIZE (swt-3.5M6-gtk-linux-x86_64.zip) = 4913862
+MD5 (swt-3.6M3-gtk-linux-x86.zip) = 76e9946c7346844fa884f054dbd81be8
+SHA256 (swt-3.6M3-gtk-linux-x86.zip) = bc0f4c2742d05e776fe229182c59842aefd215ff061d0e6db3da8905442a0e1e
+SIZE (swt-3.6M3-gtk-linux-x86.zip) = 4912929
+MD5 (swt-3.6M3-gtk-linux-x86_64.zip) = 427c16441ea485dac8a17d39e71e1952
+SHA256 (swt-3.6M3-gtk-linux-x86_64.zip) = bce9ba231e9bac39d05c612f8c5aa928fe3032f1ef534d592b7b454183233938
+SIZE (swt-3.6M3-gtk-linux-x86_64.zip) = 5106024
+MD5 (swt-3.6M3-gtk-linux-ppc.zip) = edcbecd37b5ea989db2694dae0b2f60f
+SHA256 (swt-3.6M3-gtk-linux-ppc.zip) = 97c334b0ba094754f8c51baaf841802f9403082e11fbec3e1b8a6816b8115e1b
+SIZE (swt-3.6M3-gtk-linux-ppc.zip) = 4982762
diff --git a/x11-toolkits/swt-devel/files/build.xml b/x11-toolkits/swt-devel/files/build.xml
new file mode 100644
index 000000000000..62a15f50581c
--- /dev/null
+++ b/x11-toolkits/swt-devel/files/build.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright (c) 2009 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+<project name="org.eclipse.swt.gtk.freebsd.%%ARCH%%" default="build.jar" basedir=".">
+
+	<target name="init">
+		<property name="ws" value="gtk"/>
+		<property name="os" value="freebsd"/>
+		<property name="destination" value="${basedir}"/>
+                <property name="javac.verbose" value="false"/>
+                <property name="javac.debug" value="off"/>
+		<property name="input.srcdir" value="${basedir}/org"/>
+		<property name="output.jar" value="${basedir}/%%OUTPUT_JAR%%"/>
+		<property name="output.classes" value="${basedir}/classes"/>
+	</target>
+
+	<target name="all" depends="build.jar"/>
+
+	<target name="build.classes" depends="init">
+		<mkdir dir="${output.classes}"/>
+		<javac	srcdir="${input.srcdir}" destdir="${output.classes}" 
+			debug="${javac.debug}" verbose="${javac.verbose}" 
+			source="1.4" target="1.4">
+		</javac>
+	</target>
+
+	<target name="build.jar" depends="build.nativeLibraries">
+		<jar destfile="${output.jar}" index="false">
+			<fileset dir="${output.classes}">
+				<exclude name="**/*.java"/>
+				<exclude name="**/*.o"/>
+				<exclude name="**/*.so"/>
+				<!-- exclude CVS archive -->
+				<exclude name="**/CVS/**"/>
+			</fileset>
+			<fileset dir="${basedir}">
+				<include name="**/version.txt"/>
+				<include name="**/*.properties"/>
+			</fileset>
+		</jar>
+	</target>
+
+	<target name="clean" depends="init">
+		<delete dir="${output.classes}"/>
+		<delete file="${output.jar}"/>
+		<exec  executable="sh" failonerror="true">
+			<arg value="build.sh"/>
+			<arg value="clean"/>
+		</exec>
+	</target>
+
+	<target name="build.nativeLibraries" depends="build.classes">
+		<exec  executable="sh" failonerror="true">
+			<arg value="build.sh"/>
+		</exec>
+	</target>
+
+</project>
diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh
index 4abed71c5246..11dbfcdc98d3 100644
--- a/x11-toolkits/swt-devel/files/patch-build.sh
+++ b/x11-toolkits/swt-devel/files/patch-build.sh
@@ -1,6 +1,6 @@
---- build.sh.orig	2009-01-23 18:22:22.000000000 -0500
-+++ build.sh	2009-02-18 03:07:45.000000000 -0500
-@@ -37,6 +37,9 @@
+--- build.sh.orig	2009-10-30 17:04:40.000000000 -0500
++++ build.sh	2009-12-01 11:28:40.000000000 -0600
+@@ -44,6 +44,9 @@
  	"FreeBSD")
  		SWT_OS=freebsd
  		MAKEFILE=make_freebsd.mak
@@ -10,26 +10,28 @@
  		;;
  	*)
  		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
-@@ -68,15 +71,16 @@
+@@ -75,10 +78,10 @@
  esac
  
  # For 64-bit CPUs, we have a switch
 -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
 +if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
- 	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
 -		XLIB64=-L/usr/X11R6/lib64
 +		XLIB64=-L${LOCALBASE}/lib64
  		export XLIB64
  	fi
+ 	if [ ${MODEL} = 'ppc64' ]; then
+@@ -89,6 +92,7 @@
+ 	export SWT_PTR_CFLAGS
  fi
  
 +if [ x${MAKE_GNOME} = "xmake_gnome" ]; then
  if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
  	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
  	MAKE_GNOME=make_gnome
-@@ -84,7 +88,9 @@
+@@ -96,7 +100,9 @@
  	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
  	echo "    *** SWT Program support for GNOME will not be compiled."
  fi
@@ -39,7 +41,7 @@
  if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
  	echo "Cairo found, compiling SWT support for the cairo graphics library."
  	MAKE_CAIRO=make_cairo
-@@ -92,30 +98,18 @@
+@@ -104,30 +110,17 @@
  	echo "Cairo not found:"
  	echo "    *** Advanced graphics support using cairo will not be compiled."
  fi
@@ -55,25 +57,28 @@
 -	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
 -		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
 -		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
-+if [ ${GECKO} != "" ]; then
-+		echo "Using ${GECKO} for gecko support"
-+		MOZILLA_INCLUDES=`pkg-config --cflags ${GECKO}-xpcom`
-+		MOZILLA_LIBS=`pkg-config --libs ${GECKO}-xpcom`
- 		export MOZILLA_INCLUDES
- 		export MOZILLA_LIBS
- 		MAKE_MOZILLA=make_mozilla
--	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
--		MOZILLA_INCLUDES=`pkg-config --cflags libxul`
--		MOZILLA_LIBS=`pkg-config --libs libxul`
 -		export MOZILLA_INCLUDES
 -		export MOZILLA_LIBS
 -		MAKE_MOZILLA=make_mozilla
+-	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+-		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+-		XULRUNNER_LIBS=`pkg-config --libs libxul`
+-		export XULRUNNER_INCLUDES
+-		export XULRUNNER_LIBS
+-		MAKE_MOZILLA=make_xulrunner
 -	else
 -		echo "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
-+else
-+		echo "gecko support was not enabled"
- 		echo "    *** Mozilla embedding support will not be compiled."
+-		echo "    *** Mozilla embedding support will not be compiled."
 -	fi
++if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
++	echo "Using libxul for gecko support"
++	XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding`
++	XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding`
++	export XULRUNNER_INCLUDES
++	export XULRUNNER_LIBS
++else
++	echo "None of the following libraries were found:  XULRunner/XPCOM"
++	echo "    *** Mozilla embedding support will not be compiled."
  fi
  
  # Find AWT if available
diff --git a/x11-toolkits/swt-devel/files/patch-build.xml b/x11-toolkits/swt-devel/files/patch-build.xml
deleted file mode 100644
index 417c38d35e84..000000000000
--- a/x11-toolkits/swt-devel/files/patch-build.xml
+++ /dev/null
@@ -1,113 +0,0 @@
---- build.xml.orig	2005-12-05 15:14:46.000000000 -0500
-+++ build.xml	2007-10-11 13:38:48.000000000 -0400
-@@ -1,55 +1,57 @@
- <?xml version="1.0" encoding="UTF-8"?>
-+<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jar" basedir=".">
- 
--<project default="build_gtk_lib" basedir="../../..">
-+	<target name="init">
-+		<property name="ws" value="gtk"/>
-+		<property name="os" value="freebsd"/>
-+		<property name="destination" value="${basedir}"/>
-+                <property name="javac.verbose" value="false"/>
-+                <property name="javac.debug" value="off"/>
-+		<property name="input.srcdir" value="${basedir}/org"/>
-+		<property name="output.jar" value="${basedir}/swt-devel.jar"/>
-+		<property name="output.classes" value="${basedir}/classes"/>
-+	</target>
-+
-+	<target name="all" depends="build.jar"/>
-+
-+	<target name="build.classes" depends="init">
-+		<mkdir dir="${output.classes}"/>
-+		<!-- -source & -target taken from Eclipse 32M4 CVS build -->
-+		<javac	srcdir="${input.srcdir}" destdir="${output.classes}" 
-+			debug="${javac.debug}" verbose="${javac.verbose}" 
-+			source="1.3" target="1.2">
-+		</javac>
-+	</target>
-+
-+	<target name="build.jar" depends="build.nativeLibraries">
-+		<jar destfile="${output.jar}" index="false">
-+			<fileset dir="${output.classes}">
-+				<exclude name="**/*.java"/>
-+				<exclude name="**/*.o"/>
-+				<exclude name="**/*.so"/>
-+				<!-- exclude CVS archive -->
-+				<exclude name="**/CVS/**"/>
-+			</fileset>
-+			<fileset dir="${basedir}">
-+				<include name="**/version.txt"/>
-+				<include name="**/*.properties"/>
-+			</fileset>
-+		</jar>
-+	</target>
-+
-+	<target name="clean" depends="init">
-+		<delete dir="${output.classes}"/>
-+		<delete file="${output.jar}"/>
-+		<exec  executable="sh" failonerror="true">
-+			<arg value="build.sh"/>
-+			<arg value="clean"/>
-+		</exec>
-+	</target>
-+
-+	<target name="build.nativeLibraries" depends="build.classes">
-+		<exec  executable="sh" failonerror="true">
-+			<arg value="build.sh"/>
-+		</exec>
-+	</target>
- 
--<target name="init">
--	<eclipse.refreshLocal resource="org.eclipse.swt" depth="infinite" />
--	<eclipse.refreshLocal resource="org.eclipse.swt.tools" depth="infinite" />	
--   	<eclipse.incrementalBuild project="org.eclipse.swt" kind="incr" />
--</target>
--	
--<!-- Build swt.so for GTK -->
--<target name="build_gtk_lib" depends="init">
--	<exec dir="./bin/library" executable="sh">
--		<arg line="${basedir}/bin/library/build.sh"/>
--		<arg line="install"/>
--	</exec>
--	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" />
--</target>
--
--<!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)-->
--<target name="build_ppc_gtk_lib" depends="init">
--	<exec dir="./bin/library" executable="sh">
--		<env key="MODEL" value="ppc"/>
--		<arg line="${basedir}/bin/library/build.sh"/>
--		<arg line="install"/>
--	</exec>
--	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.ppc" depth="infinite" />
--</target>
--
--<!-- Build swt.so for Solaris GTK (no Mozilla) -->
--<target name="build_solaris_gtk_lib" depends="init">
--	<exec dir="./bin/library" executable="sh">
--		<arg line="${basedir}/bin/library/build.sh"/>
--		<arg line="install"/>
--	</exec>
--	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.solaris.sparc" depth="infinite" />
--</target>
--	
--<!-- Build swt.so for GTK 64 -->
--<target name="build_gtk64_lib" depends="init">
--	<exec dir="./bin/library" executable="sh">
--		<arg line="${basedir}/bin/library/build.sh"/>
--		<arg line="install"/>
--	</exec>
--	<eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86_64" depth="infinite" />	
--</target>
--
--<target name="clean">
--	<exec dir="./bin/library" executable="sh">
--		<arg line="${basedir}/bin/library/build.sh"/>
--		<arg line="clean"/>
--	</exec>
--</target>
--
--</project>
-\ No newline at end of file
-+</project>
diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
index 290378a0ad82..559baf131279 100644
--- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
@@ -1,5 +1,12 @@
---- make_freebsd.mak.orig	2008-02-07 16:42:56.000000000 +0200
-+++ make_freebsd.mak	2008-03-22 21:32:28.000000000 +0200
+--- make_freebsd.mak.orig	2009-10-30 17:04:40.000000000 -0500
++++ make_freebsd.mak	2009-12-01 10:23:19.000000000 -0600
+@@ -1,5 +1,5 @@
+ #*******************************************************************************
+-# Copyright (c) 2000, 2007 IBM Corporation and others.
++# Copyright (c) 2000, 2009 IBM Corporation and others.
+ # All rights reserved. This program and the accompanying materials
+ # are made available under the terms of the Eclipse Public License v1.0
+ # which accompanies this distribution, and is available at
 @@ -9,7 +9,7 @@
  #     IBM Corporation - initial API and implementation
  #*******************************************************************************
@@ -18,20 +25,52 @@
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
-@@ -59,7 +59,7 @@
+@@ -58,8 +58,8 @@
+ GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
  GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
  
- GLXCFLAGS = 
+-GLXCFLAGS = 
 -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
++GLXCFLAGS = -I$(LOCALBASE)/include
 +GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
  
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
-@@ -97,17 +97,18 @@
+@@ -78,7 +78,17 @@
+ 	-I$(JAVA_HOME)/include/freebsd \
+ 	${SWT_PTR_CFLAGS}
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+-	
++MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
++	-DNO__1XPCOMGlueStartup \
++	-DNO__1XPCOMGlueLoadXULFunctions \
++	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
++	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
++	-DNO_nsDynamicFunctionLoad_1sizeof \
++	-DNO__1Call__IIIIII \
++	-DNO__1Call__JJJJJI \
++	-DNO_nsDynamicFunctionLoad
++XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
++
+ SWT_OBJECTS = swt.o c.o c_stats.o callback.o
+ CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
+ AWT_OBJECTS = swt_awt.o
+@@ -87,7 +97,7 @@
+ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
+ GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
+ MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
+-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
++XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+@@ -95,19 +105,20 @@
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
  		-DFREEBSD -DGTK \
++		-I$(LOCALBASE)/include \
  		-I$(JAVA_HOME)/include \
  		-I$(JAVA_HOME)/include/freebsd \
-+		-I$(LOCALBASE)/include \
  		-fPIC \
  		${SWT_PTR_CFLAGS}
  LIBS = -shared -fPIC
@@ -52,3 +91,77 @@
  
  #
  # SWT libs
+@@ -161,7 +172,7 @@
+ #
+ # AWT lib
+ #
+-make_awt:$(AWT_LIB)
++make_awt: $(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+ 	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
+@@ -203,53 +214,47 @@
+ #
+ # Mozilla lib
+ #
+-make_mozilla:$(MOZILLA_LIB)
++make_mozilla: $(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+ 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
++	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+ 
+ xpcom_structs.o: xpcom_structs.cpp
+-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
++	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+ 	
+ xpcom_custom.o: xpcom_custom.cpp
+-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
++	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+ 
+ xpcom_stats.o: xpcom_stats.cpp
+-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
++	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+ 
+ #
+ # XULRunner lib
+ #
+-make_xulrunner:$(XULRUNNER_LIB)
++make_xulrunner: $(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
++	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+ 
+ xpcomxul_structs.o: xpcom_structs.cpp
+-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
++	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+ 	
+ xpcomxul_custom.o: xpcom_custom.cpp
+-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
++	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+ 
+ xpcomxul_stats.o: xpcom_stats.cpp
+-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+-
+-xpcomxulglue.o: xpcomglue.cpp
+-	$(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
+-
+-xpcomxulglue_stats.o: xpcomglue_stats.cpp
+-	$(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
++	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ 
+ #
+ # XPCOMInit lib
+ #
+-make_xpcominit:$(XPCOMINIT_LIB)
++make_xpcominit: $(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+ 	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
diff --git a/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java b/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java
new file mode 100644
index 000000000000..cfa060d3fb72
--- /dev/null
+++ b/x11-toolkits/swt-devel/files/patch-org_eclipse_swt_internal_C.java
@@ -0,0 +1,14 @@
+--- org/eclipse/swt/internal/C.java.orig	2009-07-11 08:21:27.000000000 -0500
++++ org/eclipse/swt/internal/C.java	2009-07-11 08:22:21.000000000 -0500
+@@ -13,9 +13,9 @@
+ public class C extends Platform {
+ 
+ 	static {
+-		if ("Linux".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
++		if ("FreeBSD".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ 			try {
+-				Library.loadLibrary ("libXm.so.2", false); //$NON-NLS-1$
++				Library.loadLibrary ("libXm.so.3", false); //$NON-NLS-1$
+ 			} catch (Throwable ex) {}
+ 		}
+ 		Library.loadLibrary ("swt"); //$NON-NLS-1$