- Update to latest version (3.3M6)

PR:		ports/109782
Submitted by:	maintainer (Robert Noland)

4 files changed, 27 insertions, 53 deletions

diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 52f069e98722..6bfd90e422c2 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	swt-devel
-PORTVERSION=	3.3M4
+PORTVERSION=	3.3M6
 CATEGORIES=	x11-toolkits devel java
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR=	S-${PORTVERSION}-200612141445
+MASTER_SITE_SUBDIR=	S-${PORTVERSION}-200703231616
 DISTNAME=	swt-${PORTVERSION}-${DIST_EXT}
 
 MAINTAINER=	rnoland@2hip.net
@@ -17,7 +17,7 @@ COMMENT=	Standard Widget Toolkit for Java
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-SWT_VERSION=	3320
+SWT_VERSION=	3333
 OUTPUT_JAR=	swt-devel.jar
 
 USE_ZIP=	yes
@@ -38,7 +38,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${OUTPUT_JAR} \
 		lib/libswt-glx-gtk-%%BUILD%%.so \
 		lib/libswt-pi-gtk-%%BUILD%%.so
 
-WRKSRC=		${WRKDIR}/swt-I20061214-1445-${DIST_EXT}
+NO_WRKSUBDIR=	yes
 
 OPTIONS=	CAIRO "Cairo Support" on \
 		GNOMEVFS "Gnome VFS Support" on \
@@ -80,7 +80,6 @@ DIST_EXT=	gtk-linux-x86
 post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
 	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
-	@${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \
diff --git a/x11-toolkits/swt-devel/distinfo b/x11-toolkits/swt-devel/distinfo
index 9b6e09b06cb2..6c25d3c6d466 100644
--- a/x11-toolkits/swt-devel/distinfo
+++ b/x11-toolkits/swt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (swt-3.3M4-gtk-linux-x86.zip) = 50fb0cd84aa2345adbd400a41e7037f2
-SHA256 (swt-3.3M4-gtk-linux-x86.zip) = e69cc8acb90f3f8e6be3967c41dfa359eb201fe92be07a511b0834edc895e610
-SIZE (swt-3.3M4-gtk-linux-x86.zip) = 3007189
-MD5 (swt-3.3M4-gtk-linux-x86_64.zip) = dfed4adfe069c5ac30d36a0dbb78711b
-SHA256 (swt-3.3M4-gtk-linux-x86_64.zip) = 82b923b621f8dc0c3abbd20fd3ec32ea68e3fb4cafe6a2afa2dde9f8e7f5d0db
-SIZE (swt-3.3M4-gtk-linux-x86_64.zip) = 3088585
+MD5 (swt-3.3M6-gtk-linux-x86.zip) = 5ec02fa9c0a7ea2a409ab12bdffa1977
+SHA256 (swt-3.3M6-gtk-linux-x86.zip) = a3f4bc5763b0482b3217cfa0459131c5250e1344645bb2aacf943cf8bf457801
+SIZE (swt-3.3M6-gtk-linux-x86.zip) = 3253942
+MD5 (swt-3.3M6-gtk-linux-x86_64.zip) = edd3939694f7139f6ae24cf87fdd5dc2
+SHA256 (swt-3.3M6-gtk-linux-x86_64.zip) = f7a560b45683df1b05097dea79a1daf49aea6830cd9a4fdcb4c2d7df10bbe086
+SIZE (swt-3.3M6-gtk-linux-x86_64.zip) = 3376463
diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh
index 79d04b543aa5..3b715b2252e0 100644
--- a/x11-toolkits/swt-devel/files/patch-build.sh
+++ b/x11-toolkits/swt-devel/files/patch-build.sh
@@ -1,17 +1,6 @@
---- build.sh.orig	Mon Nov 21 23:48:16 2005
-+++ build.sh	Wed Jan 10 14:36:04 2007
-@@ -31,6 +31,10 @@
- 		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 @@
+--- build.sh.orig	Fri Feb  2 17:43:50 2007
++++ build.sh	Fri Mar  2 23:12:01 2007
+@@ -65,7 +65,7 @@
  esac
  
  # For 64-bit CPUs, we have a switch
@@ -20,7 +9,7 @@
  	SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
  	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
-@@ -70,6 +74,7 @@
+@@ -74,6 +74,7 @@
  	fi
  fi
  
@@ -28,7 +17,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
-@@ -77,7 +82,9 @@
+@@ -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
@@ -38,18 +27,18 @@
  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
-@@ -85,7 +92,9 @@
+@@ -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 "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
  	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- 		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
-@@ -97,6 +106,7 @@
- 		echo "Mozilla/XPCOM libraries not found:"
+ 		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
diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
index d7fe76dd8298..b3948d9a88e9 100644
--- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
@@ -1,5 +1,5 @@
---- make_freebsd.mak.orig	Wed Jan 10 14:36:04 2007
-+++ make_freebsd.mak	Wed Jan 10 14:36:04 2007
+--- 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
  #*******************************************************************************
@@ -9,7 +9,7 @@
  
  include make_common.mak
  
-@@ -42,7 +42,7 @@
+@@ -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`
@@ -18,7 +18,7 @@
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
-@@ -55,7 +55,7 @@
+@@ -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 = 
@@ -27,24 +27,10 @@
  
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
-@@ -72,7 +72,7 @@
- 	-fPIC \
- 	-I. \
- 	-I$(JAVA_HOME)/include \
--	-I$(JAVA_HOME)/include/linux \
-+	-I$(JAVA_HOME)/include/freebsd \
- 	${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
- 	
-@@ -89,18 +89,19 @@
- CFLAGS = -O -Wall \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
--		-DLINUX -DGTK \
-+		-DFREEBSD -DGTK \
+@@ -97,15 +97,16 @@
+ 		-DFREEBSD -DGTK \
  		-I$(JAVA_HOME)/include \
--		-I$(JAVA_HOME)/include/linux \
-+		-I$(JAVA_HOME)/include/freebsd \
+ 		-I$(JAVA_HOME)/include/freebsd \
 +		-I$(X11BASE)/include \
  		-fPIC \
  		${SWT_PTR_CFLAGS}