ports/161338: [patch] update x11-toolkits/swt to 3.7

John Hein jhein at symmetricom.com
Thu Oct 6 16:40:04 UTC 2011


>Number:         161338
>Category:       ports
>Synopsis:       [patch] update x11-toolkits/swt to 3.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 06 16:40:03 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     John Hein
>Release:        
>Organization:
>Environment:

>Description:

Update x11-toolkits/swt to 3.7 ...
 - back to MASTER_SITE_ECLIPSE
 - ant not needed (and build.xml is gone)
 - refresh patches - mostly just regenerate the diffs,
   but also got rid of freebsd-specific ${LOCALBASE} in favor of
   pkg-config tweaks (that can be fed upstream)
 - add a note explaining source for cryptic flags
   in patch-make_freesd.mak (for the sake of sane
   patch maintenance)

>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile	1 Oct 2011 19:44:24 -0000	1.23
+++ Makefile	6 Oct 2011 16:06:17 -0000
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	swt
-DISTVERSION=	3.5.2
+DISTVERSION=	3.7
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits devel java
-#MASTER_SITES=	${MASTER_SITE_ECLIPSE}
-MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/
-MASTER_SITE_SUBDIR=	R-${DISTVERSION}-201002111343
+MASTER_SITES=	${MASTER_SITE_ECLIPSE}
+MASTER_SITE_SUBDIR=	R-${DISTVERSION}-201106131736
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
 
 MAINTAINER=	giffunip at tutopia.com
@@ -31,7 +31,6 @@ USE_GNOME=	gtk20 pkgconfig
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 JAVA_OS=	native
-USE_ANT=	yes
 MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
 MAKEFILE=	make_freebsd.mak
 USE_LDCONFIG=	yes
Index: distinfo
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo	1 Oct 2011 19:44:24 -0000	1.11
+++ distinfo	6 Oct 2011 16:11:46 -0000
@@ -1,4 +1,4 @@
-SHA256 (swt-3.5.2-gtk-linux-x86.zip) = 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7
-SIZE (swt-3.5.2-gtk-linux-x86.zip) = 4881316
-SHA256 (swt-3.5.2-gtk-linux-x86_64.zip) = 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7
-SIZE (swt-3.5.2-gtk-linux-x86_64.zip) = 5068674
+SHA256 (swt-3.7-gtk-linux-x86.zip) = 98c438e65c6372ef14b3faca07b5e4020a331d047e2fa660f820dfa54641f172
+SIZE (swt-3.7-gtk-linux-x86.zip) = 5371493
+SHA256 (swt-3.7-gtk-linux-x86_64.zip) = 0640ff2a1906aa2cbead27aa4d004f4baa5f77e1f9e1df923b6984633d72e3f3
+SIZE (swt-3.7-gtk-linux-x86_64.zip) = 5667945
Index: files/patch-OS.java
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/files/patch-OS.java,v
retrieving revision 1.1
diff -u -p -r1.1 patch-OS.java
--- files/patch-OS.java	2 Dec 2006 01:10:28 -0000	1.1
+++ files/patch-OS.java	3 Oct 2011 11:12:10 -0000
@@ -1,6 +1,6 @@
---- ./org/eclipse/swt/internal/gtk/OS.java.orig	Thu Dec 15 15:19:38 2005
-+++ ./org/eclipse/swt/internal/gtk/OS.java	Mon Jan 23 23:51:20 2006
-@@ -20,18 +20,20 @@
+--- ./org/eclipse/swt/internal/gtk/OS.java.orig	2011-06-13 20:52:36.000000000 -0600
++++ ./org/eclipse/swt/internal/gtk/OS.java	2011-10-03 05:03:18.000000000 -0600
+@@ -23,18 +23,20 @@
  	}
  	
  	/** OS Constants */
Index: files/patch-build.sh
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/files/patch-build.sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-build.sh
--- files/patch-build.sh	1 Dec 2009 21:00:28 -0000	1.4
+++ files/patch-build.sh	6 Oct 2011 16:25:25 -0000
@@ -1,6 +1,6 @@
---- build.sh.orig	2009-06-11 16:10:54.000000000 -0500
-+++ build.sh	2009-12-01 14:42:09.000000000 -0600
-@@ -44,6 +44,9 @@
+--- build.sh.orig	2011-06-13 20:52:36.000000000 -0600
++++ build.sh	2011-08-27 12:04:04.000000000 -0600
+@@ -70,6 +70,9 @@
  	"FreeBSD")
  		SWT_OS=freebsd
  		MAKEFILE=make_freebsd.mak
@@ -10,26 +10,29 @@
  		;;
  	*)
  		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
-@@ -75,15 +78,16 @@
+@@ -108,12 +111,8 @@
  esac
- 
+ echo "Model is ${MODEL}"
  # 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
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
- 	export SWT_PTR_CFLAGS
- 	if [ -d /lib64 ]; then
+-	if [ -d /lib64 ]; then
 -		XLIB64=-L/usr/X11R6/lib64
-+		XLIB64=-L${LOCALBASE}/lib64
- 		export XLIB64
- 	fi
+-		export XLIB64
+-	fi
+ 	if [ ${MODEL} = 'ppc64' ]; then
+ 		if [ ${OS} = 'AIX' ]; then
+ 			SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
+@@ -147,6 +146,7 @@
+ 	export SWT_LFLAGS SWT_PTR_CFLAGS
  fi
  
 +if [ x${MAKE_GNOME} = "xmake_gnome" ]; then
- if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
+ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES"  -a 	 ${MODEL} != "sparc64" 	]; then
  	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
  	MAKE_GNOME=make_gnome
-@@ -91,7 +95,9 @@
+@@ -154,7 +154,9 @@
  	echo "libgnome-2.0 and libgnomeui-2.0 not found:"
  	echo "    *** SWT Program support for GNOME will not be compiled."
  fi
@@ -39,13 +42,13 @@
  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
-@@ -99,30 +105,17 @@
+@@ -162,30 +164,17 @@
  	echo "Cairo not found:"
  	echo "    *** Advanced graphics support using cairo will not be compiled."
  fi
 +fi
  
--if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; 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`
@@ -79,4 +82,4 @@
 +	echo "    *** Mozilla embedding support will not be compiled."
  fi
  
- # Find AWT if available
+ if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then
Index: files/patch-build.xml
===================================================================
RCS file: files/patch-build.xml
diff -N files/patch-build.xml
--- files/patch-build.xml	1 Dec 2009 21:00:28 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,113 +0,0 @@
---- 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>
Index: files/patch-make_freebsd.mak
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/files/patch-make_freebsd.mak,v
retrieving revision 1.6
diff -u -p -r1.6 patch-make_freebsd.mak
--- files/patch-make_freebsd.mak	1 Dec 2009 21:00:28 -0000	1.6
+++ files/patch-make_freebsd.mak	6 Oct 2011 16:05:21 -0000
@@ -1,12 +1,11 @@
---- make_freebsd.mak.orig	2009-06-11 16:10:54.000000000 -0500
-+++ make_freebsd.mak	2009-07-11 08:37:19.000000000 -0500
-@@ -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
+Note: it looks like the MOZILLAEXCLUDES addition and xpcomxulglue removal
+were copied from make_linux.mak in the port for swt 3.5.1.  Keep those
+changes for 3.7 since the make_linux.make for 3.7 still does the same.
+Other changes in the 3.7 make_linux.make have not been added (e.g.,
+support for building with webkit) in this version of the patch.
+
+--- make_freebsd.mak.orig	2011-06-13 20:52:36.000000000 -0600
++++ make_freebsd.mak	2011-10-03 05:03:18.000000000 -0600
 @@ -9,7 +9,7 @@
  #     IBM Corporation - initial API and implementation
  #*******************************************************************************
@@ -16,30 +15,37 @@
  
  include make_common.mak
  
-@@ -46,7 +46,7 @@
+@@ -45,21 +45,22 @@
+ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
  
  # 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`
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
 -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
++GTKCFLAGS = `pkg-config --cflags gtk+-2.0 xtst`
++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0 xtst` -lgtk-x11-2.0 -lgthread-2.0 -lXtst
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
-@@ -58,8 +58,8 @@
+ AWT_LFLAGS = -shared
+ AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
+ 
+-ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
++ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 xtst`
+ ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
+ 
  GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
  GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
  
--GLXCFLAGS = 
--GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
-+GLXCFLAGS = -I$(LOCALBASE)/include
-+GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
+-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
++GLXCFLAGS = `pkg-config --cflags gl glu`
++GLXLIBS = `pkg-config --libs-only-L gl glu` -lGL -lGLU -lm
  
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
-@@ -78,7 +78,17 @@
+@@ -78,7 +79,17 @@
  	-I$(JAVA_HOME)/include/freebsd \
  	${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
 -	
 +MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
 +	-DNO__1XPCOMGlueStartup \
@@ -55,7 +61,7 @@
  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
-@@ -87,7 +97,7 @@
+@@ -87,7 +98,7 @@
  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
@@ -64,26 +70,19 @@
  XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
-@@ -95,19 +105,20 @@
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DFREEBSD -DGTK \
-+		-I$(LOCALBASE)/include \
- 		-I$(JAVA_HOME)/include \
- 		-I$(JAVA_HOME)/include/freebsd \
- 		-fPIC \
+@@ -101,13 +112,13 @@
  		${SWT_PTR_CFLAGS}
- LIBS = -shared -fPIC
+ LFLAGS = -shared -fPIC
  
 -ifndef NO_STRIP
--	AWT_LIBS := $(AWT_LIBS) -s
--	MOZILLALIBS := $(MOZILLALIBS) -s
--	LIBS := $(LIBS) -s
+-	AWT_LFLAGS := $(AWT_LFLAGS) -s
+-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+-	LFLAGS := $(LFLAGS) -s
 -endif
 +.ifndef NO_STRIP
-+AWT_LIBS := $(AWT_LIBS) -s
-+MOZILLALIBS := $(MOZILLALIBS) -s
-+LIBS := $(LIBS) -s
++AWT_LFLAGS := $(AWT_LFLAGS) -s
++MOZILLALFLAGS := $(MOZILLALFLAGS) -s
++LFLAGS := $(LFLAGS) -s
 +.endif
  
 -all: make_swt make_atk make_gnome make_glx
@@ -92,7 +91,7 @@
  #
  # SWT libs
 @@ -209,16 +220,16 @@
- 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
+ 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
  
  xpcom.o: xpcom.cpp
 -	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
@@ -113,7 +112,7 @@
  #
  # XULRunner lib
 @@ -229,22 +240,16 @@
- 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ 	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
  
  xpcomxul.o: xpcom.cpp
 -	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
Index: files/patch-org_eclipse_swt_internal_C.java
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/files/patch-org_eclipse_swt_internal_C.java,v
retrieving revision 1.1
diff -u -p -r1.1 patch-org_eclipse_swt_internal_C.java
--- files/patch-org_eclipse_swt_internal_C.java	1 Dec 2009 21:00:28 -0000	1.1
+++ files/patch-org_eclipse_swt_internal_C.java	3 Oct 2011 11:15:37 -0000
@@ -1,5 +1,5 @@
---- 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
+--- org/eclipse/swt/internal/C.java.orig	2011-06-13 20:52:36.000000000 -0600
++++ org/eclipse/swt/internal/C.java	2011-10-03 05:03:18.000000000 -0600
 @@ -13,9 +13,9 @@
  public class C extends Platform {
  
Index: files/patch-os.c
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11-toolkits/swt/files/patch-os.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-os.c
--- files/patch-os.c	1 Dec 2009 21:00:28 -0000	1.1
+++ files/patch-os.c	3 Oct 2011 11:14:50 -0000
@@ -1,6 +1,6 @@
---- os.c.orig	2008-12-31 16:16:39.000000000 -0500
-+++ os.c	2008-12-31 16:20:29.000000000 -0500
-@@ -18036,11 +18036,16 @@
+--- os.c.orig	2011-06-13 20:52:36.000000000 -0600
++++ os.c	2011-10-03 05:03:18.000000000 -0600
+@@ -20097,11 +20097,16 @@
  	jintLong rc = 0;
  	OS_NATIVE_ENTER(env, that, realpath_FUNC);
  	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list