Attachment #81603 for bug #116845

View | Details | Raw Unified | Return to bug 116845
Collapse All | Expand All

Lines 1-4 Link Here

(-)Makefile (-15 / +10 lines)
1	# New ports collection makefile for: swt32	1	# New ports collection makefile for: swt
2	# Date created: 2006-11-16	2	# Date created: 2006-11-16
3	# Whom: Robert C. Noland III <rnoland@2hip.net>	3	# Whom: Robert C. Noland III <rnoland@2hip.net>
4	#	4	#
Lines 6-17 Link Here
6	#	6	#
7		7
8	PORTNAME= swt	8	PORTNAME= swt
9	PORTVERSION= 3.2.2	9	DISTVERSION= 3.3
10	PORTREVISION= 1	10	#PORTREVISION= 1
11	CATEGORIES= x11-toolkits devel java	11	CATEGORIES= x11-toolkits devel java
12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}	12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}
13	MASTER_SITE_SUBDIR= R-${PORTVERSION}-200702121330	13	MASTER_SITE_SUBDIR= R-${DISTVERSION}-200706251500
14	DISTNAME= swt-${PORTVERSION}-${DIST_EXT}	14	DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
15		15
16	MAINTAINER= rnoland@2hip.net	16	MAINTAINER= rnoland@2hip.net
17	COMMENT= Standard Widget Toolkit for Java	17	COMMENT= Standard Widget Toolkit for Java
Lines 20-26 Link Here
20		20
21	CONFLICTS= swt-3.1*	21	CONFLICTS= swt-3.1*
22		22
23	SWT_VERSION= 3236	23	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-${ARCH}-os.c
		24
		25	SWT_VERSION= 3346
24	OUTPUT_JAR= swt.jar	26	OUTPUT_JAR= swt.jar
25		27
26	USE_ZIP= yes	28	USE_ZIP= yes
Lines 41-47 Link Here
41	lib/libswt-glx-gtk-%%BUILD%%.so \	43	lib/libswt-glx-gtk-%%BUILD%%.so \
42	lib/libswt-pi-gtk-%%BUILD%%.so	44	lib/libswt-pi-gtk-%%BUILD%%.so
43		45
44	WRKSRC= ${WRKDIR}/swt-M20070212-1330-${DIST_EXT}	46	NO_WRKSUBDIR= yes
45		47
46	OPTIONS= CAIRO "Cairo Support" on \	48	OPTIONS= CAIRO "Cairo Support" on \
47	GNOMEVFS "Gnome VFS Support" on \	49	GNOMEVFS "Gnome VFS Support" on \
Lines 66-76 Link Here
66		68
67	.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"	69	.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
68		70
69	PLIST_FILES+= lib/libswt-${GECKO}-gtk-%%BUILD%%.so \	71	PLIST_FILES+= lib/libswt-mozilla-gtk-%%BUILD%%.so
70	lib/libswt-${GECKO}14-profile-gtk-%%BUILD%%.so \
71	lib/libswt-${GECKO}17-profile-gtk-%%BUILD%%.so \
72	lib/libswt-${GECKO}18-profile-gtk-%%BUILD%%.so
73
74	MAKE_MOZILLA= make_mozilla	72	MAKE_MOZILLA= make_mozilla
75	.endif	73	.endif
76		74
Lines 87-99 Link Here
87	post-extract:	85	post-extract:
88	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")	86	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
89	@${RM} -f ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar	87	@${RM} -f ${WRKSRC}/.o ${WRKSRC}/.so ${WRKSRC}/*.jar
90	@${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
91		88
92	post-patch:	89	post-patch:
93	@${REINPLACE_CMD} -e 's\|mozilla-\|${GECKO}-\|' \	90	@${REINPLACE_CMD} -e 's\|mozilla-\|${GECKO}-\|' \
94	${WRKSRC}/build.sh	91	${WRKSRC}/build.sh
95	@${REINPLACE_CMD} -e 's\|swt-mozilla\|swt-${GECKO}\|' \
96	${WRKSRC}/make_freebsd.mak
97		92
98	do-install:	93	do-install:
99	${MKDIR} ${JAVAJARDIR}	94	${MKDIR} ${JAVAJARDIR}

Lines 1-6 Link Here

(-)distinfo (-6 / +6 lines)
1	MD5 (swt-3.2.2-gtk-linux-x86.zip) = e1340b6c7cf9b617145667b15b02fd49	1	MD5 (swt-3.3-gtk-linux-x86.zip) = 7398cdf9340cb131b76ed98495239520
2	SHA256 (swt-3.2.2-gtk-linux-x86.zip) = aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28	2	SHA256 (swt-3.3-gtk-linux-x86.zip) = 08a3b6329c878c99025e9c9b530b65c4315a37ce52e796e89ae6dc62269df163
3	SIZE (swt-3.2.2-gtk-linux-x86.zip) = 3117432	3	SIZE (swt-3.3-gtk-linux-x86.zip) = 4448296
4	MD5 (swt-3.2.2-gtk-linux-x86_64.zip) = d678cedc336a58b0147081b56de6a1f3	4	MD5 (swt-3.3-gtk-linux-x86_64.zip) = b0a4b3442e61d2968acecfa18cdd3aa9
5	SHA256 (swt-3.2.2-gtk-linux-x86_64.zip) = a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56	5	SHA256 (swt-3.3-gtk-linux-x86_64.zip) = f4357ed778da7f0b91b08b0ed67fe2bc907a2c6a1b5808442f6390f56fa85b50
6	SIZE (swt-3.2.2-gtk-linux-x86_64.zip) = 2996317	6	SIZE (swt-3.3-gtk-linux-x86_64.zip) = 4622274




--- os.c.orig	2007-06-25 16:06:14.000000000 -0400
+++ os.c	2007-08-10 11:54:37.000000000 -0400
@@ -17397,11 +17397,16 @@
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) {
+		if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	} else
+		lparg1 = malloc(PATH_MAX);
 	rc = (jlong)realpath((const char *)lparg0, (char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	if (!arg1 && lparg1 && rc == 0)
+		free(lparg1);
 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
 	return rc;
 }




--- os.c.orig	2007-04-26 14:03:00.000000000 -0400
+++ os.c	2007-08-10 11:56:22.000000000 -0400
@@ -17397,11 +17397,16 @@
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, realpath_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) {
+	    if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	} else
+	    lparg1 = malloc(PATH_MAX);
 	rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+	if (!arg1 && lparg1 && rc == 0)
+	    free(lparg1);
 	OS_NATIVE_EXIT(env, that, realpath_FUNC);
 	return rc;
 }




--- build.sh.orig	Thu May 31 18:04:22 2007
+++ build.sh	Mon Jun 11 18:25:04 2007
@@ -65,15 +65,16 @@
 		SWT_OS=solaris
 		MAKEFILE=make_solaris.mak
 		;;
+	"FreeBSD")
+		SWT_OS=freebsd
+		MAKEFILE=make_freebsd.mak
+		;;
 	*)
 		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
 		MAKEFILE=make_linux.mak
@@ -61,7 +65,7 @@
 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=-DSWT_PTR_SIZE_64
 	export SWT_PTR_CFLAGS
 	if [ -d /lib64 ]; then
-		XLIB64=-L/usr/X11R6/lib64
+		XLIB64=-L${X11BASE}/lib64
 		export XLIB64
 	fi
 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
@@ -81,7 +82,9 @@
 	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
 	echo "    *** SWT Program support for GNOME will not be compiled."
 fi

 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
@@ -89,7 +92,9 @@
 	echo "Cairo not found:"
 	echo "    *** Advanced graphics support using cairo will not be compiled."
 fi
+fi
 
+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
 if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
 	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
 		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
@@ -107,6 +112,7 @@
 		echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
 		echo "    *** Mozilla embedding support will not be compiled."
 	fi
 fi
+fi
 fi
 
 # Find AWT if available
 if [ -z "${AWT_LIB_PATH}" ]; then
@@ -126,5 +136,5 @@
 if [ "x${1}" = "xclean" ]; then
 	make -f $MAKEFILE clean
 else
-	make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
+	make -f $MAKEFILE all ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
 fi




--- make_freebsd.mak.orig	Thu Jan 25 12:05:38 2007
+++ make_freebsd.mak	Sat Mar  3 00:48:48 2007
@@ -9,7 +9,7 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************

 
 include make_common.mak
 
@@ -46,7 +46,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`

 
 CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
 
@@ -59,7 +59,7 @@
 GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
 
 GLXCFLAGS = 

 
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
@@ -97,15 +97,16 @@
 		-DFREEBSD -DGTK \
 	-I. \
 	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
+	-I$(JAVA_HOME)/include/freebsd \
 	${SWT_PTR_CFLAGS}
 MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic
 	
@@ -98,15 +98,16 @@
 CFLAGS = -O -Wall \
 		-DSWT_VERSION=$(SWT_VERSION) \
 		$(NATIVE_STATS) \
-		-DLINUX -DGTK \
+		-DFREEBSD -DGTK \
 		-I$(JAVA_HOME)/include \
 		-I$(JAVA_HOME)/include/freebsd \
+		-I$(X11BASE)/include \
 		-fPIC \
+                -fpic -fPIC \
+                -I$(X11BASE)/include \
 		${SWT_PTR_CFLAGS}
 LIBS = -shared -fPIC
+LIBS = -shared -fPIC -fpic -s
 
-ifndef NO_STRIP
-	AWT_LIBS := $(AWT_LIBS) -s
-	MOZILLALIBS := $(MOZILLALIBS) -s
-	LIBS := $(LIBS) -s
-endif
+.ifndef NO_STRIP
+AWT_LIBS := $(AWT_LIBS) -s
+MOZILLALIBS := $(MOZILLALIBS) -s
+LIBS := $(LIBS) -s
+.endif
 
 all: make_swt make_atk make_gnome make_glx
+all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) make_glx
 
 #
 # SWT libs
@@ -220,22 +221,22 @@
 	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp	
 
 $(PROFILE14_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE14_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE17_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE17_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE18_OBJECTS): xpcom_profile.cpp
-	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
+	$(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE18_INCLUDES} -c xpcom_profile.cpp	
 
 $(PROFILE14_LIB): $(PROFILE14_OBJECTS)
-	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
+	$(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE14_LIBS}
 
 $(PROFILE17_LIB): $(PROFILE17_OBJECTS)
-	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
+	$(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE17_LIBS}
 
 $(PROFILE18_LIB): $(PROFILE18_OBJECTS)
-	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
+	$(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE18_LIBS}
 
 #
 # GLX lib
@@ -264,4 +265,4 @@
 # Clean
 #
 clean:
-	rm -f *.o *.so
+	rm -f *.o *.so *.jar

Removed Link Here

(-)files/patch-xpcom_profile.h (-11 lines)
1	--- xpcom_profile.h.orig Wed Nov 15 17:47:13 2006
2	+++ xpcom_profile.h Wed Nov 15 17:41:25 2006
3	@@ -32,7 +32,7 @@
4	#define NDEBUG
5
6	#include "nsCOMPtr.h"
7	-#include "nsProfileDirServiceProvider.h"
8	+#include "profdirserviceprovider/nsProfileDirServiceProvider.h"
9	#include "xpcom_stats.h"
10
11	#endif /* INC_xpcom_profile_H */

Return to bug 116845

Added Link Here

(-)files/extra-patch-amd64-os.c (+20 lines)
1	--- os.c.orig 2007-06-25 16:06:14.000000000 -0400
2	+++ os.c 2007-08-10 11:54:37.000000000 -0400
3	@@ -17397,11 +17397,16 @@
4	jlong rc = 0;
5	OS_NATIVE_ENTER(env, that, realpath_FUNC);
6	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
7	- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
8	+ if (arg1) {
9	+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
10	+ } else
11	+ lparg1 = malloc(PATH_MAX);
12	rc = (jlong)realpath((const char )lparg0, (char )lparg1);
13	fail:
14	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
15	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
16	+ if (!arg1 && lparg1 && rc == 0)
17	+ free(lparg1);
18	OS_NATIVE_EXIT(env, that, realpath_FUNC);
19	return rc;
20	}

Added Link Here

(-)files/extra-patch-i386-os.c (+20 lines)
1	--- os.c.orig 2007-04-26 14:03:00.000000000 -0400
2	+++ os.c 2007-08-10 11:56:22.000000000 -0400
3	@@ -17397,11 +17397,16 @@
4	jint rc = 0;
5	OS_NATIVE_ENTER(env, that, realpath_FUNC);
6	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
7	- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
8	+ if (arg1) {
9	+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
10	+ } else
11	+ lparg1 = malloc(PATH_MAX);
12	rc = (jint)realpath((const char )lparg0, (char )lparg1);
13	fail:
14	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
15	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
16	+ if (!arg1 && lparg1 && rc == 0)
17	+ free(lparg1);
18	OS_NATIVE_EXIT(env, that, realpath_FUNC);
19	return rc;
20	}

Lines 1-26 Link Here

(-)files/patch-build.sh (-31 / +15 lines)
1	--- build.sh.orig Mon Nov 21 23:48:16 2005	1	--- build.sh.orig Thu May 31 18:04:22 2007
2	+++ build.sh Fri Dec 1 16:34:03 2006	2	+++ build.sh Mon Jun 11 18:25:04 2007
3	@@ -31,6 +31,10 @@	3	@@ -65,15 +65,16 @@
4	SWT_OS=solaris
5	MAKEFILE=make_solaris.mak
6	;;
7	+ "FreeBSD")
8	+ SWT_OS=freebsd
9	+ MAKEFILE=make_freebsd.mak
10	+ ;;
11	*)
12	SWT_OS=`uname -s \| tr -s '[:upper:]' '[:lower:]'`
13	MAKEFILE=make_linux.mak
14	@@ -61,7 +65,7 @@
15	esac	4	esac
16		5
17	# For 64-bit CPUs, we have a switch	6	# For 64-bit CPUs, we have a switch
18	-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' ]; then	7	-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
19	+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'amd64' ]; then	8	+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
20	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64	9	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
21	export SWT_PTR_CFLAGS	10	export SWT_PTR_CFLAGS
22	if [ -d /lib64 ]; then	11	if [ -d /lib64 ]; then
23	@@ -70,6 +74,7 @@	12	- XLIB64=-L/usr/X11R6/lib64
		13	+ XLIB64=-L${X11BASE}/lib64
		14	export XLIB64
24	fi	15	fi
25	fi	16	fi
26		17
Lines 28-34 Link Here
28	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then	19	if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
29	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"	20	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
30	MAKE_GNOME=make_gnome	21	MAKE_GNOME=make_gnome
31	@@ -77,7 +82,9 @@	22	@@ -81,7 +82,9 @@
32	echo "libgnome-2.0 and libgnomeui-2.0 not found:"	23	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
33	echo " *** SWT Program support for GNOME will not be compiled."	24	echo " *** SWT Program support for GNOME will not be compiled."
34	fi	25	fi
Lines 38-65 Link Here
38	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then	29	if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
39	echo "Cairo found, compiling SWT support for the cairo graphics library."	30	echo "Cairo found, compiling SWT support for the cairo graphics library."
40	MAKE_CAIRO=make_cairo	31	MAKE_CAIRO=make_cairo
41	@@ -85,7 +92,9 @@	32	@@ -89,7 +92,9 @@
42	echo "Cairo not found:"	33	echo "Cairo not found:"
43	echo " *** Advanced graphics support using cairo will not be compiled."	34	echo " *** Advanced graphics support using cairo will not be compiled."
44	fi	35	fi
45	+fi	36	+fi
46		37
47	+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then	38	+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
48	if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then	39	if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
49	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then	40	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
50	GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`	41	MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
51	@@ -98,6 +107,7 @@	42	@@ -107,6 +112,7 @@
		43	echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
52	echo " *** Mozilla embedding support will not be compiled."	44	echo " *** Mozilla embedding support will not be compiled."
53	fi	45	fi
54	fi
55	+fi	46	+fi
		47	fi
56		48
57	# Find AWT if available	49	# Find AWT if available
58	if [ -z "${AWT_LIB_PATH}" ]; then
59	@@ -126,5 +136,5 @@
60	if [ "x${1}" = "xclean" ]; then
61	make -f $MAKEFILE clean
62	else
63	- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
64	+ make -f $MAKEFILE all ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
65	fi

Lines 1-5 Link Here

(-)files/patch-make_freebsd.mak (-65 / +21 lines)
1	--- make_freebsd.mak.orig Tue Dec 12 11:49:31 2006	1	--- make_freebsd.mak.orig Thu Jan 25 12:05:38 2007
2	+++ make_freebsd.mak Tue Dec 12 11:50:20 2006	2	+++ make_freebsd.mak Sat Mar 3 00:48:48 2007
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
4	# IBM Corporation - initial API and implementation	4	# IBM Corporation - initial API and implementation
5	#*******************************************************************************	5	#*******************************************************************************
Lines 9-15 Link Here
9		9
10	include make_common.mak	10	include make_common.mak
11		11
12	@@ -48,7 +48,7 @@	12	@@ -46,7 +46,7 @@
13		13
14	# 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)
15	GTKCFLAGS = `pkg-config --cflags gtk+-2.0`	15	GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
Lines 18-24 Link Here
18		18
19	CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc	19	CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
20		20
21	@@ -61,7 +61,7 @@	21	@@ -59,7 +59,7 @@
22	GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2	22	GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
23		23
24	GLXCFLAGS =	24	GLXCFLAGS =
Lines 27-95 Link Here
27		27
28	# Uncomment for Native Stats tool	28	# Uncomment for Native Stats tool
29	#NATIVE_STATS = -DNATIVE_STATS	29	#NATIVE_STATS = -DNATIVE_STATS
30	@@ -78,7 +78,7 @@	30	@@ -97,15 +97,16 @@
31	-fPIC \	31	-DFREEBSD -DGTK \
32	-I. \
33	-I$(JAVA_HOME)/include \
34	- -I$(JAVA_HOME)/include/linux \
35	+ -I$(JAVA_HOME)/include/freebsd \
36	${SWT_PTR_CFLAGS}
37	MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic
38
39	@@ -98,15 +98,16 @@
40	CFLAGS = -O -Wall \
41	-DSWT_VERSION=$(SWT_VERSION) \
42	$(NATIVE_STATS) \
43	- -DLINUX -DGTK \
44	+ -DFREEBSD -DGTK \
45	-I$(JAVA_HOME)/include \	32	-I$(JAVA_HOME)/include \
46	- -I$(JAVA_HOME)/include/linux \	33	-I$(JAVA_HOME)/include/freebsd \
47	- -fPIC \	34	+ -I$(X11BASE)/include \
48	+ -I$(JAVA_HOME)/include/freebsd \	35	-fPIC \
49	+ -fpic -fPIC \
50	+ -I$(X11BASE)/include \
51	${SWT_PTR_CFLAGS}	36	${SWT_PTR_CFLAGS}
52	-LIBS = -shared -fPIC -s	37	LIBS = -shared -fPIC
53	+LIBS = -shared -fPIC -fpic -s
54		38
		39	-ifndef NO_STRIP
		40	- AWT_LIBS := $(AWT_LIBS) -s
		41	- MOZILLALIBS := $(MOZILLALIBS) -s
		42	- LIBS := $(LIBS) -s
		43	-endif
		44	+.ifndef NO_STRIP
		45	+AWT_LIBS := $(AWT_LIBS) -s
		46	+MOZILLALIBS := $(MOZILLALIBS) -s
		47	+LIBS := $(LIBS) -s
		48	+.endif
55		49
56	-all: make_swt make_atk make_gnome make_glx	50	all: make_swt make_atk make_gnome make_glx
57	+all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) make_glx
58		51
59	#
60	# SWT libs
61	@@ -220,22 +221,22 @@
62	$(CXX) $(MOZILLACFLAGS) ${GECKO_INCLUDES} -c xpcom_stats.cpp
63
64	$(PROFILE14_OBJECTS): xpcom_profile.cpp
65	- $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${PROFILE14_INCLUDES} -c xpcom_profile.cpp
66	+ $(CXX) -o $(PROFILE14_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE14_INCLUDES} -c xpcom_profile.cpp
67
68	$(PROFILE17_OBJECTS): xpcom_profile.cpp
69	- $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${PROFILE17_INCLUDES} -c xpcom_profile.cpp
70	+ $(CXX) -o $(PROFILE17_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE17_INCLUDES} -c xpcom_profile.cpp
71
72	$(PROFILE18_OBJECTS): xpcom_profile.cpp
73	- $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${PROFILE18_INCLUDES} -c xpcom_profile.cpp
74	+ $(CXX) -o $(PROFILE18_OBJECTS) $(MOZILLACFLAGS) ${GECKO_INCLUDES} ${PROFILE18_INCLUDES} -c xpcom_profile.cpp
75
76	$(PROFILE14_LIB): $(PROFILE14_OBJECTS)
77	- $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${PROFILE14_LIBS}
78	+ $(CXX) -o $(PROFILE14_LIB) $(PROFILE14_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE14_LIBS}
79
80	$(PROFILE17_LIB): $(PROFILE17_OBJECTS)
81	- $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${PROFILE17_LIBS}
82	+ $(CXX) -o $(PROFILE17_LIB) $(PROFILE17_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE17_LIBS}
83
84	$(PROFILE18_LIB): $(PROFILE18_OBJECTS)
85	- $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${PROFILE18_LIBS}
86	+ $(CXX) -o $(PROFILE18_LIB) $(PROFILE18_OBJECTS) $(MOZILLALIBS) ${GECKO_LIBS} ${PROFILE18_LIBS}
87
88	#
89	# GLX lib
90	@@ -264,4 +265,4 @@
91	# Clean
92	#
93	clean:
94	- rm -f .o .so
95	+ rm -f .o .so *.jar