1 files changed, 43 insertions, 13 deletions

diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh
index 57ae62b43451..4abed71c5246 100644
--- a/x11-toolkits/swt-devel/files/patch-build.sh
+++ b/x11-toolkits/swt-devel/files/patch-build.sh
@@ -1,6 +1,16 @@
---- build.sh.orig	Thu May 31 18:04:22 2007
-+++ build.sh	Mon Jun 11 18:25:04 2007
-@@ -65,15 +65,16 @@
+--- 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 @@
+ 	"FreeBSD")
+ 		SWT_OS=freebsd
+ 		MAKEFILE=make_freebsd.mak
++		if uname -p > /dev/null 2>&1; then
++			MODEL=`uname -p`
++		fi
+ 		;;
+ 	*)
+ 		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
+@@ -68,15 +71,16 @@
  esac
  
  # For 64-bit CPUs, we have a switch
@@ -19,7 +29,7 @@
  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 @@
+@@ -84,7 +88,9 @@
  	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
  	echo "    *** SWT Program support for GNOME will not be compiled."
  fi
@@ -29,21 +39,41 @@
  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 @@
+@@ -92,30 +98,18 @@
  	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:"
+-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`
+-		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
+-		export MOZILLA_INCLUDES
+-		export MOZILLA_LIBS
+-		MAKE_MOZILLA=make_mozilla
+-	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
+-	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."
- 	fi
-+fi
+-	fi
  fi
  
  # Find AWT if available