Attachment #196936 for bug #229360




# $FreeBSD$

PORTNAME=	swt
PORTVERSION=	4.7.3a
DISTVERSION=	${PORTVERSION}
CATEGORIES=	x11-toolkits devel java
#MASTER_SITES=	ECLIPSE/R-${DISTVERSION}-201002111343
MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}

MAINTAINER=	ports@FreeBSD.org


ONLY_FOR_ARCHS=	i386 amd64

CONFLICTS=	swt-[3|4]*

SWT_VERSION=	4763
OUTPUT_JAR=	swt.jar

USE_GL=		yes


NO_WRKSUBDIR=	yes

OPTIONS_DEFINE=	CAIRO
OPTIONS_DEFAULT=	CAIRO
GNOMEVFS_DESC=	Gnome VFS Support
BROWSER_DESC=	Gecko Browser Support

.include <bsd.port.options.mk>


MAKE_CAIRO=	make_cairo
.endif

.if ${PORT_OPTIONS:MGNOMEVFS}
USE_GNOME+=	gnomevfs2 libgnome libgnomeui
PLIST_FILES+=	lib/libswt-gnome-gtk-%%BUILD%%.so
MAKE_GNOME=	make_gnome
.endif

.if ${PORT_OPTIONS:MBROWSER}
USES=		gecko
BROKEN=		Does not build with newer libxul
PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
MAKE_MOZILLA=	make_xulrunner
.endif

MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
		MAKE_GNOME=${MAKE_GNOME} \
		MAKE_MOZILLA=${MAKE_MOZILLA} \
		JAVA_HOME=${JAVA_HOME}


post-extract:
	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
	@${INSTALL_DATA} ${FILESDIR}/build.xml ${WRKSRC}/build.xml

post-patch:
	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \

Lines 1-4 Link Here

(-)b/x11-toolkits/swt/distinfo (-4 / +3 lines)
1	SHA256 (swt-3.5.2-gtk-linux-x86.zip) = 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7	1	TIMESTAMP = 1530093075
2	SIZE (swt-3.5.2-gtk-linux-x86.zip) = 4881316	2	SHA256 (swt-4.7.3a-gtk-linux-x86_64.zip) = 856005feff25de55f7d7b304d2cbed9dd24938c7b6d07ffd7413b8361a4753e3
3	SHA256 (swt-3.5.2-gtk-linux-x86_64.zip) = 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7	3	SIZE (swt-4.7.3a-gtk-linux-x86_64.zip) = 6360885
4	SIZE (swt-3.5.2-gtk-linux-x86_64.zip) = 5068674




--- org/eclipse/swt/internal/gtk/OS.java.orig	2018-03-01 07:35:24.000000000 +0100
+++ org/eclipse/swt/internal/gtk/OS.java	2018-06-27 11:17:53.291216000 +0200
@@ -20,19 +20,20 @@
 
 public class OS extends C {
 	/** OS Constants */
-	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN;
+	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN, IsFreeBSD;
 	static {
 
 		/* Initialize the OS flags and locale constants */
+		/* make bootstrap compatible with `uname -s` for FreeBSD */
 		String osName = System.getProperty ("os.name");
-		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false;
+		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false, isFreeBSD = false;
 		if (osName.equals ("Linux")) isLinux = true;
+		if (osName.equals ("FreeBSD")) isFreeBSD = true;
 		if (osName.equals ("AIX")) isAIX = true;
 		if (osName.equals ("Solaris")) isSunOS = true;
 		if (osName.equals ("SunOS")) isSunOS = true;
 		if (osName.equals ("HP-UX")) isHPUX = true;
 		if (osName.startsWith("Windows")) isWin32 = true;
-		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX; IsWin32 = isWin32;
+		if (osName.equals ("FreeBSD")) isFreeBSD = true;
+		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX; IsWin32 = isWin32;  IsFreeBSD = isFreeBSD;
 
 		byte[] buffer = new byte[4];
 		long /*int*/ ptr = OS.malloc(4);




--- build.sh.orig	2018-03-01 07:35:22.000000000 +0100
+++ build.sh	2018-06-27 11:24:43.371971000 +0200
@@ -115,9 +115,19 @@
 			fi
 		fi
 		;;
+	"DragonFly")

+			MODEL=`uname -p`
+		fi
 		;;
 	"Windows_NT")
 		SWT_OS=win32
@@ -469,10 +479,10 @@
 
 
 # For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64'  -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' -o ${MODEL} = 'ppc64le' ]; then
@@ -517,37 +527,24 @@
 	export SWT_LFLAGS SWT_PTR_CFLAGS
 fi
 
-
 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
@@ -91,7 +102,9 @@ else
 	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
 	echo "    *** SWT Program support for GNOME will not be compiled."
 fi
+fi
 
+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
 if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
 	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
 	MAKE_CAIRO=make_cairo
 else
 	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
 	echo "    *** Advanced graphics support using cairo will not be compiled."
 fi
+fi
 
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then
-	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
-		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
-		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`

-		export XULRUNNER_LIBS
-		MAKE_MOZILLA=make_xulrunner
-	else
-		func_echo_error "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
-		func_echo_error "   >> Mozilla embedding support will not be compiled."
-	fi
+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
+	echo "Using libxul for gecko support"




--- 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.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>




--- make_freebsd.mak.orig	2018-03-01 07:35:22.000000000 +0100
+++ make_freebsd.mak	2018-06-27 11:33:21.105457000 +0200
@@ -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
 #*******************************************************************************

 
 include make_common.mak
 
@@ -43,7 +43,7 @@
 
 # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
 GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
 
 AWT_LFLAGS = -shared
 AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
@@ -51,7 +51,8 @@
 ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
 ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
 
-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
+GLXCFLAGS = -I$(LOCALBASE)/include
+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
 
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
@@ -70,14 +71,24 @@
 	-I$(JAVA_HOME)/include/freebsd \
 	${SWT_PTR_CFLAGS}
 MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-	
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+	-DNO__1XPCOMGlueStartup \

+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
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 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
 
@@ -85,17 +96,18 @@
 		-DSWT_VERSION=$(SWT_VERSION) \
 		$(NATIVE_STATS) \
 		-DFREEBSD -DGTK \

 		-I$(JAVA_HOME)/include/freebsd \
 		-fPIC \
 		${SWT_PTR_CFLAGS}
 LFLAGS = -shared -fPIC
 
-ifndef NO_STRIP
-	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
-	LFLAGS := $(LFLAGS) -s
-endif
+.ifndef NO_STRIP
+AWT_LFLAGS := $(AWT_LFLAGS) -s
+MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+LFLAGS := $(LFLAGS) -s
+.endif
 
 all: make_swt make_atk make_glx
+all: make_swt make_atk make_glx
 
@@ -173,16 +185,16 @@
 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
@@ -209,16 +220,16 @@
 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
 
 xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp

 
 #
 # XULRunner lib
@@ -193,22 +205,16 @@
 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
 
 xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp




--- 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$

Return to bug 229360

Lines 2-12 Link Here

(-)b/x11-toolkits/swt/Makefile (-23 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= swt	4	PORTNAME= swt
5	DISTVERSION= 3.5.2	5	PORTVERSION= 4.7.3a
6	PORTREVISION= 5	6	DISTVERSION= ${PORTVERSION}
7	CATEGORIES= x11-toolkits devel java	7	CATEGORIES= x11-toolkits devel java
8	#MASTER_SITES= ECLIPSE/R-${DISTVERSION}-201002111343	8	#MASTER_SITES= ECLIPSE/R-${DISTVERSION}-201002111343
9	MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/R-${DISTVERSION}-201002111343/	9	MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
10	DISTNAME= swt-${DISTVERSION}-${DIST_EXT}	10	DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
11		11
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
Lines 16-24 LICENSE= EPL Link Here
16		16
17	ONLY_FOR_ARCHS= i386 amd64	17	ONLY_FOR_ARCHS= i386 amd64
18		18
19	CONFLICTS= swt-3.1*	19	CONFLICTS= swt-[3\|4]*
20		20
21	SWT_VERSION= 3557	21	SWT_VERSION= 4763
22	OUTPUT_JAR= swt.jar	22	OUTPUT_JAR= swt.jar
23		23
24	USE_GL= yes	24	USE_GL= yes
Lines 41-50 PLIST_FILES= %%JAVAJARDIR%%/${OUTPUT_JAR} \ Link Here
41		41
42	NO_WRKSUBDIR= yes	42	NO_WRKSUBDIR= yes
43		43
44	OPTIONS_DEFINE= CAIRO GNOMEVFS BROWSER	44	OPTIONS_DEFINE= CAIRO
45	OPTIONS_DEFAULT= CAIRO GNOMEVFS	45	OPTIONS_DEFAULT= CAIRO
46	GNOMEVFS_DESC= Gnome VFS Support
47	BROWSER_DESC= Gecko Browser Support
48		46
49	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
50		48
Lines 54-74 PLIST_FILES+= lib/libswt-cairo-gtk-%%BUILD%%.so Link Here
54	MAKE_CAIRO= make_cairo	52	MAKE_CAIRO= make_cairo
55	.endif	53	.endif
56		54
57	.if ${PORT_OPTIONS:MGNOMEVFS}
58	USE_GNOME+= gnomevfs2 libgnome libgnomeui
59	PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so
60	MAKE_GNOME= make_gnome
61	.endif
62
63	.if ${PORT_OPTIONS:MBROWSER}
64	USES= gecko
65	BROKEN= Does not build with newer libxul
66	PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so
67	MAKE_MOZILLA= make_xulrunner
68	.endif
69
70	MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \	55	MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \
71	MAKE_GNOME=${MAKE_GNOME} \
72	MAKE_MOZILLA=${MAKE_MOZILLA} \	56	MAKE_MOZILLA=${MAKE_MOZILLA} \
73	JAVA_HOME=${JAVA_HOME}	57	JAVA_HOME=${JAVA_HOME}
74		58
Lines 81-86 DIST_EXT= gtk-linux-x86 Link Here
81	post-extract:	65	post-extract:
82	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")	66	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
83	@${RM} ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar	67	@${RM} ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar
		68	@${INSTALL_DATA} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
84		69
85	post-patch:	70	post-patch:
86	${SED} -e 's\|freebsd\|dragonfly\|g' ${WRKSRC}/make_freebsd.mak \	71	${SED} -e 's\|freebsd\|dragonfly\|g' ${WRKSRC}/make_freebsd.mak \

Lines 1-26 Link Here

(-)b/x11-toolkits/swt/files/patch-OS.java (-16 / +16 lines)
1	--- ./org/eclipse/swt/internal/gtk/OS.java.orig Thu Dec 15 15:19:38 2005	1	--- org/eclipse/swt/internal/gtk/OS.java.orig 2018-03-01 07:35:24.000000000 +0100
2	+++ ./org/eclipse/swt/internal/gtk/OS.java Mon Jan 23 23:51:20 2006	2	+++ org/eclipse/swt/internal/gtk/OS.java 2018-06-27 11:17:53.291216000 +0200
3	@@ -20,18 +20,20 @@	3	@@ -20,19 +20,20 @@
4	}	4
5		5	public class OS extends C {
6	/** OS Constants */	6	/** OS Constants */
7	- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX;	7	- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN;
8	+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD;	8	+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsWin32, BIG_ENDIAN, IsFreeBSD;
9	static {	9	static {
10		10
11	/* Initialize the OS flags and locale constants */	11	/* Initialize the OS flags and locale constants */
12	+ /* make bootstrap compatible with `uname -s` for FreeBSD */
13	String osName = System.getProperty ("os.name");	12	String osName = System.getProperty ("os.name");
14	- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false;	13	- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false;
15	+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isFreeBSD = false;	14	+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isWin32 = false, isFreeBSD = false;
16	if (osName.equals ("Linux")) isLinux = true;	15	if (osName.equals ("Linux")) isLinux = true;
17	+ if (osName.equals ("FreeBSD")) isFreeBSD = true;
18	if (osName.equals ("AIX")) isAIX = true;	16	if (osName.equals ("AIX")) isAIX = true;
19	if (osName.equals ("Solaris")) isSunOS = true;	17	if (osName.equals ("Solaris")) isSunOS = true;
20	if (osName.equals ("SunOS")) isSunOS = true;	18	if (osName.equals ("SunOS")) isSunOS = true;
21	if (osName.equals ("HP-UX")) isHPUX = true;	19	if (osName.equals ("HP-UX")) isHPUX = true;
22	- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX;	20	if (osName.startsWith("Windows")) isWin32 = true;
23	+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsFreeBSD = isFreeBSD; IsHPUX = isHPUX;	21	- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsWin32 = isWin32;
24	}	22	+ if (osName.equals ("FreeBSD")) isFreeBSD = true;
		23	+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsWin32 = isWin32; IsFreeBSD = isFreeBSD;
25		24
26	/** Constants */	25	byte[] buffer = new byte[4];
		26	long /int/ ptr = OS.malloc(4);

Lines 1-7 Link Here

(-)b/x11-toolkits/swt/files/patch-build.sh (-28 / +20 lines)
1	--- build.sh.orig 2010-02-12 17:49:56 UTC	1	--- build.sh.orig 2018-03-01 07:35:22.000000000 +0100
2	+++ build.sh	2	+++ build.sh 2018-06-27 11:24:43.371971000 +0200
3	@@ -41,9 +41,19 @@ case $OS in	3	@@ -115,9 +115,19 @@
4	MAKE_TYPE=gmake	4	fi
5	fi	5	fi
6	;;	6	;;
7	+ "DragonFly")	7	+ "DragonFly")
Lines 18-61 Link Here
18	+ MODEL=`uname -p`	18	+ MODEL=`uname -p`
19	+ fi	19	+ fi
20	;;	20	;;
21	*)	21	"Windows_NT")
22	SWT_OS=`uname -s \| tr -s '[:upper:]' '[:lower:]'`	22	SWT_OS=win32
23	@@ -75,15 +85,16 @@ case $MODEL in	23	@@ -469,10 +479,10 @@
24	esac	24
25		25
26	# For 64-bit CPUs, we have a switch	26	# For 64-bit CPUs, we have a switch
27	-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then	27	-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
28	+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then	28	+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'amd64' ]; then
29	SWT_PTR_CFLAGS=-DJNI64	29	SWT_PTR_CFLAGS=-DJNI64
30	export SWT_PTR_CFLAGS
31	if [ -d /lib64 ]; then	30	if [ -d /lib64 ]; then
32	- XLIB64=-L/usr/X11R6/lib64	31	- XLIB64=-L/usr/X11R6/lib64
33	+ XLIB64=-L${LOCALBASE}/lib64	32	+ XLIB64=-L${LOCALBASE}/lib64
34	export XLIB64	33	export XLIB64
35	fi	34	fi
		35	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
		36	@@ -517,37 +527,24 @@
		37	export SWT_LFLAGS SWT_PTR_CFLAGS
36	fi	38	fi
37		39
38	+if [ x${MAKE_GNOME} = "xmake_gnome" ]; then	40	-
39	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
40	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
41	MAKE_GNOME=make_gnome
42	@@ -91,7 +102,9 @@ else
43	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
44	echo " *** SWT Program support for GNOME will not be compiled."
45	fi
46	+fi
47
48	+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then	41	+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
49	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then	42	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
50	echo "Cairo found, compiling SWT support for the cairo graphics library."	43	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
51	MAKE_CAIRO=make_cairo	44	MAKE_CAIRO=make_cairo
52	@@ -99,30 +112,17 @@ else	45	else
53	echo "Cairo not found:"	46	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
54	echo " *** Advanced graphics support using cairo will not be compiled."
55	fi	47	fi
56	+fi	48	+fi
57		49
58	-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then	50	-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then
59	- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then	51	- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
60	- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`	52	- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
61	- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`	53	- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
Lines 75-82 Link Here
75	- export XULRUNNER_LIBS	67	- export XULRUNNER_LIBS
76	- MAKE_MOZILLA=make_xulrunner	68	- MAKE_MOZILLA=make_xulrunner
77	- else	69	- else
78	- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"	70	- func_echo_error "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
79	- echo " *** Mozilla embedding support will not be compiled."	71	- func_echo_error " >> Mozilla embedding support will not be compiled."
80	- fi	72	- fi
81	+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then	73	+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
82	+ echo "Using libxul for gecko support"	74	+ echo "Using libxul for gecko support"

Removed Link Here

(-)a/x11-toolkits/swt/files/patch-build.xml (-113 lines)
1	--- build.xml.orig 2005-12-05 15:14:46.000000000 -0500
2	+++ build.xml 2007-10-11 13:38:48.000000000 -0400
3	@@ -1,55 +1,57 @@
4	<?xml version="1.0" encoding="UTF-8"?>
5	+<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jar" basedir=".">
6
7	-<project default="build_gtk_lib" basedir="../../..">
8	+ <target name="init">
9	+ <property name="ws" value="gtk"/>
10	+ <property name="os" value="freebsd"/>
11	+ <property name="destination" value="${basedir}"/>
12	+ <property name="javac.verbose" value="false"/>
13	+ <property name="javac.debug" value="off"/>
14	+ <property name="input.srcdir" value="${basedir}/org"/>
15	+ <property name="output.jar" value="${basedir}/swt.jar"/>
16	+ <property name="output.classes" value="${basedir}/classes"/>
17	+ </target>
18	+
19	+ <target name="all" depends="build.jar"/>
20	+
21	+ <target name="build.classes" depends="init">
22	+ <mkdir dir="${output.classes}"/>
23	+ <!-- -source & -target taken from Eclipse 32M4 CVS build -->
24	+ <javac srcdir="${input.srcdir}" destdir="${output.classes}"
25	+ debug="${javac.debug}" verbose="${javac.verbose}"
26	+ source="1.3" target="1.2">
27	+ </javac>
28	+ </target>
29	+
30	+ <target name="build.jar" depends="build.nativeLibraries">
31	+ <jar destfile="${output.jar}" index="false">
32	+ <fileset dir="${output.classes}">
33	+ <exclude name="*/.java"/>
34	+ <exclude name="*/.o"/>
35	+ <exclude name="*/.so"/>
36	+ <!-- exclude CVS archive -->
37	+ <exclude name="/CVS/"/>
38	+ </fileset>
39	+ <fileset dir="${basedir}">
40	+ <include name="**/version.txt"/>
41	+ <include name="*/.properties"/>
42	+ </fileset>
43	+ </jar>
44	+ </target>
45	+
46	+ <target name="clean" depends="init">
47	+ <delete dir="${output.classes}"/>
48	+ <delete file="${output.jar}"/>
49	+ <exec executable="sh" failonerror="true">
50	+ <arg value="build.sh"/>
51	+ <arg value="clean"/>
52	+ </exec>
53	+ </target>
54	+
55	+ <target name="build.nativeLibraries" depends="build.classes">
56	+ <exec executable="sh" failonerror="true">
57	+ <arg value="build.sh"/>
58	+ </exec>
59	+ </target>
60
61	-<target name="init">
62	- <eclipse.refreshLocal resource="org.eclipse.swt" depth="infinite" />
63	- <eclipse.refreshLocal resource="org.eclipse.swt.tools" depth="infinite" />
64	- <eclipse.incrementalBuild project="org.eclipse.swt" kind="incr" />
65	-</target>
66	-
67	-<!-- Build swt.so for GTK -->
68	-<target name="build_gtk_lib" depends="init">
69	- <exec dir="./bin/library" executable="sh">
70	- <arg line="${basedir}/bin/library/build.sh"/>
71	- <arg line="install"/>
72	- </exec>
73	- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" />
74	-</target>
75	-
76	-<!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)-->
77	-<target name="build_ppc_gtk_lib" depends="init">
78	- <exec dir="./bin/library" executable="sh">
79	- <env key="MODEL" value="ppc"/>
80	- <arg line="${basedir}/bin/library/build.sh"/>
81	- <arg line="install"/>
82	- </exec>
83	- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.ppc" depth="infinite" />
84	-</target>
85	-
86	-<!-- Build swt.so for Solaris GTK (no Mozilla) -->
87	-<target name="build_solaris_gtk_lib" depends="init">
88	- <exec dir="./bin/library" executable="sh">
89	- <arg line="${basedir}/bin/library/build.sh"/>
90	- <arg line="install"/>
91	- </exec>
92	- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.solaris.sparc" depth="infinite" />
93	-</target>
94	-
95	-<!-- Build swt.so for GTK 64 -->
96	-<target name="build_gtk64_lib" depends="init">
97	- <exec dir="./bin/library" executable="sh">
98	- <arg line="${basedir}/bin/library/build.sh"/>
99	- <arg line="install"/>
100	- </exec>
101	- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86_64" depth="infinite" />
102	-</target>
103	-
104	-<target name="clean">
105	- <exec dir="./bin/library" executable="sh">
106	- <arg line="${basedir}/bin/library/build.sh"/>
107	- <arg line="clean"/>
108	- </exec>
109	-</target>
110	-
111	-</project>
112	\ No newline at end of file
113	+</project>

Lines 1-12 Link Here

(-)b/x11-toolkits/swt/files/patch-make_freebsd.mak (-40 / +28 lines)
1	--- make_freebsd.mak.orig 2009-06-11 16:10:54.000000000 -0500	1	--- make_freebsd.mak.orig 2018-03-01 07:35:22.000000000 +0100
2	+++ make_freebsd.mak 2009-07-11 08:37:19.000000000 -0500	2	+++ make_freebsd.mak 2018-06-27 11:33:21.105457000 +0200
3	@@ -1,5 +1,5 @@
4	#*******************************************************************************
5	-# Copyright (c) 2000, 2007 IBM Corporation and others.
6	+# Copyright (c) 2000, 2009 IBM Corporation and others.
7	# All rights reserved. This program and the accompanying materials
8	# are made available under the terms of the Eclipse Public License v1.0
9	# which accompanies this distribution, and is available at
10	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
11	# IBM Corporation - initial API and implementation	4	# IBM Corporation - initial API and implementation
12	#*******************************************************************************	5	#*******************************************************************************
Lines 16-45 Link Here
16		9
17	include make_common.mak	10	include make_common.mak
18		11
19	@@ -46,7 +46,7 @@	12	@@ -43,7 +43,7 @@
20		13
21	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)	14	# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
22	GTKCFLAGS = `pkg-config --cflags gtk+-2.0`	15	GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
23	-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst	16	-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
24	+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst	17	+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
25		18
26	CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc	19	AWT_LFLAGS = -shared
27		20	AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
28	@@ -58,8 +58,8 @@	21	@@ -51,7 +51,8 @@
29	GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`	22	ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
30	GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2	23	ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
31		24
32	-GLXCFLAGS =	25	-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
33	-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
34	+GLXCFLAGS = -I$(LOCALBASE)/include	26	+GLXCFLAGS = -I$(LOCALBASE)/include
35	+GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm	27	+GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
36		28
37	# Uncomment for Native Stats tool	29	# Uncomment for Native Stats tool
38	#NATIVE_STATS = -DNATIVE_STATS	30	#NATIVE_STATS = -DNATIVE_STATS
39	@@ -78,7 +78,17 @@	31	@@ -70,14 +71,24 @@
40	-I$(JAVA_HOME)/include/freebsd \	32	-I$(JAVA_HOME)/include/freebsd \
41	${SWT_PTR_CFLAGS}	33	${SWT_PTR_CFLAGS}
42	MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic	34	MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
43	-	35	-
44	+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \	36	+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
45	+ -DNO__1XPCOMGlueStartup \	37	+ -DNO__1XPCOMGlueStartup \
Lines 53-70 Link Here
53	+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2	45	+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
54	+	46	+
55	SWT_OBJECTS = swt.o c.o c_stats.o callback.o	47	SWT_OBJECTS = swt.o c.o c_stats.o callback.o
56	CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
57	AWT_OBJECTS = swt_awt.o	48	AWT_OBJECTS = swt_awt.o
58	@@ -87,7 +97,7 @@	49	SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
		50	CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
59	ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o	51	ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
60	GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
61	MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o	52	MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
62	-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o	53	-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
63	+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o	54	+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
64	XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o	55	XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
65	GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o	56	GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
66		57
67	@@ -95,19 +105,20 @@	58	@@ -85,17 +96,18 @@
68	-DSWT_VERSION=$(SWT_VERSION) \	59	-DSWT_VERSION=$(SWT_VERSION) \
69	$(NATIVE_STATS) \	60	$(NATIVE_STATS) \
70	-DFREEBSD -DGTK \	61	-DFREEBSD -DGTK \
Lines 73-98 Link Here
73	-I$(JAVA_HOME)/include/freebsd \	64	-I$(JAVA_HOME)/include/freebsd \
74	-fPIC \	65	-fPIC \
75	${SWT_PTR_CFLAGS}	66	${SWT_PTR_CFLAGS}
76	LIBS = -shared -fPIC	67	LFLAGS = -shared -fPIC
77		68
78	-ifndef NO_STRIP	69	-ifndef NO_STRIP
79	- AWT_LIBS := $(AWT_LIBS) -s	70	- AWT_LFLAGS := $(AWT_LFLAGS) -s
80	- MOZILLALIBS := $(MOZILLALIBS) -s	71	- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
81	- LIBS := $(LIBS) -s	72	- LFLAGS := $(LFLAGS) -s
82	-endif	73	-endif
83	+.ifndef NO_STRIP	74	+.ifndef NO_STRIP
84	+AWT_LIBS := $(AWT_LIBS) -s	75	+AWT_LFLAGS := $(AWT_LFLAGS) -s
85	+MOZILLALIBS := $(MOZILLALIBS) -s	76	+MOZILLALFLAGS := $(MOZILLALFLAGS) -s
86	+LIBS := $(LIBS) -s	77	+LFLAGS := $(LFLAGS) -s
87	+.endif	78	+.endif
88		79
89	-all: make_swt make_atk make_gnome make_glx	80	all: make_swt make_atk make_glx
90	+all: make_swt make_atk make_glx
91		81
92	#	82	@@ -173,16 +185,16 @@
93	# SWT libs	83	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
94	@@ -209,16 +220,16 @@
95	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
96		84
97	xpcom.o: xpcom.cpp	85	xpcom.o: xpcom.cpp
98	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp	86	- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
Lines 112-119 Link Here
112		100
113	#	101	#
114	# XULRunner lib	102	# XULRunner lib
115	@@ -229,22 +240,16 @@	103	@@ -193,22 +205,16 @@
116	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}	104	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
117		105
118	xpcomxul.o: xpcom.cpp	106	xpcomxul.o: xpcom.cpp
119	- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp	107	- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp

Removed Link Here

(-)a/x11-toolkits/swt/files/patch-org_eclipse_swt_internal_C.java (-14 lines)
1	--- org/eclipse/swt/internal/C.java.orig 2009-07-11 08:21:27.000000000 -0500
2	+++ org/eclipse/swt/internal/C.java 2009-07-11 08:22:21.000000000 -0500
3	@@ -13,9 +13,9 @@
4	public class C extends Platform {
5
6	static {
7	- if ("Linux".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
8	+ if ("FreeBSD".equals (System.getProperty ("os.name")) && "motif".equals (Platform.PLATFORM)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
9	try {
10	- Library.loadLibrary ("libXm.so.2", false); //$NON-NLS-1$
11	+ Library.loadLibrary ("libXm.so.3", false); //$NON-NLS-1$
12	} catch (Throwable ex) {}
13	}
14	Library.loadLibrary ("swt"); //$NON-NLS-1$