Update to 3.5m5

  * Improve handling of GECKO
  * Fix architecture detection

3 files changed, 54 insertions, 32 deletions

diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index a1681cd5ab83..8f3851102257 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	swt-devel
-DISTVERSION=	3.5M3
+DISTVERSION=	3.5M5
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	S-${DISTVERSION}-200810301917
+MASTER_SITE_SUBDIR=	S-${DISTVERSION}-200902021535
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
 MAINTAINER=	rnoland@FreeBSD.org
@@ -19,7 +19,7 @@ COMMENT=	Standard Widget Toolkit for Java
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-SWT_VERSION=	3514
+SWT_VERSION=	3529
 OUTPUT_JAR=	swt-devel.jar
 
 USE_ZIP=	yes
@@ -61,17 +61,13 @@ MAKE_GNOME=	make_gnome
 .endif
 
 .if defined(WITH_BROWSER)
-USE_GECKO=	firefox seamonkey mozilla
-
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-
+USE_GECKO=	xulrunner firefox mozilla
 PLIST_FILES+=	lib/libswt-mozilla-gtk-%%BUILD%%.so
-MAKE_MOZILLA=	make_mozilla
 .endif
 
 MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
 		MAKE_GNOME=${MAKE_GNOME} \
-		MAKE_MOZILLA=${MAKE_MOZILLA}
+		GECKO=${GECKO}
 
 .if (${ARCH} == "amd64")
 DIST_EXT=	gtk-linux-x86_64
@@ -83,10 +79,6 @@ post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
 	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \
-		${WRKSRC}/build.sh
-
 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 6ac1ad11a286..d72ae7c68a3c 100644
--- a/x11-toolkits/swt-devel/distinfo
+++ b/x11-toolkits/swt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (swt-3.5M3-gtk-linux-x86.zip) = 49b43087cd4052b9ef5c5cc6e29c749a
-SHA256 (swt-3.5M3-gtk-linux-x86.zip) = 651d949ad1060b013c836981336f3d4f3d0ed85ece877c266bb9995c11ecb12b
-SIZE (swt-3.5M3-gtk-linux-x86.zip) = 4620437
-MD5 (swt-3.5M3-gtk-linux-x86_64.zip) = 60ae756f20e607a001ba7d34ab308a46
-SHA256 (swt-3.5M3-gtk-linux-x86_64.zip) = c71be6c5587c87c38a50ee2e36fbb6dc9db0d47c43d16a82967f464a5cbe6131
-SIZE (swt-3.5M3-gtk-linux-x86_64.zip) = 4799940
+MD5 (swt-3.5M5-gtk-linux-x86.zip) = d41c6d3f8548eea54dc8085e6b35933f
+SHA256 (swt-3.5M5-gtk-linux-x86.zip) = c059090291c9dfa58c2da4008b36a150c0f1617f277bf1ea90ca6990a0d0444d
+SIZE (swt-3.5M5-gtk-linux-x86.zip) = 4697598
+MD5 (swt-3.5M5-gtk-linux-x86_64.zip) = aa203cfa7948b7eebf8f35a3f790cf50
+SHA256 (swt-3.5M5-gtk-linux-x86_64.zip) = 34d149616bec640c415dda679b4386ea35e36961159c40a5eccae83ada11d6ff
+SIZE (swt-3.5M5-gtk-linux-x86_64.zip) = 4877581
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