Index: Makefile
===================================================================
--- Makefile	(版本 527675)
+++ Makefile	(工作副本)
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	swt
-DISTVERSION=	4.7.3a
+DISTVERSION=	4.14
 CATEGORIES=	x11-toolkits devel java
-MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201803300640/
+MASTER_SITES=	http://archive.eclipse.org/eclipse/downloads/drops4/R-${DISTVERSION}-201912100610/
 DISTNAME=	swt-${DISTVERSION}-${DIST_EXT}
+DIST_EXT=	gtk-linux-x86_64
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standard Widget Toolkit for Java
@@ -12,66 +13,34 @@
 
 LICENSE=	EPL
 
-ONLY_FOR_ARCHS=	amd64 i386
-BROKEN_i386=	missing distinfo
+ONLY_FOR_ARCHS=	amd64
 
-USES=		gl gnome pkgconfig zip:infozip xorg
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+USES=		gmake pkgconfig gnome zip:infozip
 
-SWT_VERSION=	4763
+SWT_VERSION=	4930r7
 OUTPUT_JAR=	swt.jar
 
-USE_GL=		glu gl
-USE_GNOME=	gtk20
+USE_GNOME=	gtk30
 USE_JAVA=	yes
-USE_XORG=	xtst
+JAVA_VERSION=	1.8+
 JAVA_OS=	native
 USE_ANT=	yes
 MAKE_ARGS+=	-Doutput.jar=${OUTPUT_JAR}
-MAKEFILE=	make_freebsd.mak
+MAKEFILE=	make_linux.mak
 USE_LDCONFIG=	yes
 PLIST_SUB=	BUILD=${SWT_VERSION}
-PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR} \
-		lib/libswt-atk-gtk-${SWT_VERSION}.so \
-		lib/libswt-awt-gtk-${SWT_VERSION}.so \
-		lib/libswt-gtk-${SWT_VERSION}.so \
-		lib/libswt-glx-gtk-${SWT_VERSION}.so \
-		lib/libswt-pi-gtk-${SWT_VERSION}.so
+PLIST_FILES=	${JAVAJARDIR}/${OUTPUT_JAR}
 
 NO_WRKSUBDIR=	yes
 
-OPTIONS_DEFINE=	CAIRO
-OPTIONS_DEFAULT=	CAIRO
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:graphics/cairo
-PLIST_FILES+=	lib/libswt-cairo-gtk-${SWT_VERSION}.so
-MAKE_CAIRO=	make_cairo
-.endif
-
-MAKE_ENV+=	MAKE_CAIRO=${MAKE_CAIRO} \
-		MAKE_MOZILLA=${MAKE_MOZILLA} \
-		JAVA_HOME=${JAVA_HOME}
-
-.if (${ARCH} == "amd64")
-DIST_EXT=	gtk-linux-x86_64
-.else
-DIST_EXT=	gtk-linux-x86
-.endif
-
 post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
 	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
 	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/build.xml
 
-post-patch:
-	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
-		> ${WRKSRC}/make_dragonfly.mak
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${STAGEDIR}${JAVAJARDIR}/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(版本 527675)
+++ distinfo	(工作副本)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530093075
-SHA256 (swt-4.7.3a-gtk-linux-x86_64.zip) = 856005feff25de55f7d7b304d2cbed9dd24938c7b6d07ffd7413b8361a4753e3
-SIZE (swt-4.7.3a-gtk-linux-x86_64.zip) = 6360885
+TIMESTAMP = 1583023230
+SHA256 (swt-4.14-gtk-linux-x86_64.zip) = 442fdae96b0a75ffe3d753fd3394113630766050cd2390e92a83ade17ceac08b
+SIZE (swt-4.14-gtk-linux-x86_64.zip) = 3898527
Index: files/build.xml
===================================================================
--- files/build.xml	(版本 527675)
+++ files/build.xml	(工作副本)
@@ -9,7 +9,7 @@
     Contributors:
         IBM Corporation - initial API and implementation
  -->
-<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jar" basedir=".">
+<project name="org.eclipse.swt.gtk.freebsd.amd64" default="build.jar" basedir=".">
 
 	<target name="init">
 		<property name="ws" value="gtk"/>
@@ -16,7 +16,7 @@
 		<property name="os" value="freebsd"/>
 		<property name="destination" value="${basedir}"/>
                 <property name="javac.verbose" value="false"/>
-                <property name="javac.debug" value="off"/>
+                <property name="javac.debug" value="on"/>
 		<property name="input.srcdir" value="${basedir}/org"/>
 		<property name="output.jar" value="${basedir}/swt.jar"/>
 		<property name="output.classes" value="${basedir}/classes"/>
@@ -38,12 +38,13 @@
 			<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="**/*.css"/>
+				<include name="**/*.so"/>
 				<include name="**/*.properties"/>
 			</fileset>
 		</jar>
Index: files/patch-build.sh
===================================================================
--- files/patch-build.sh	(版本 527675)
+++ files/patch-build.sh	(工作副本)
@@ -1,84 +1,67 @@
---- build.sh.orig	2018-03-01 07:35:22.000000000 +0100
-+++ build.sh	2018-06-27 11:24:43.371971000 +0200
-@@ -115,9 +115,19 @@
- 			fi
- 		fi
+--- build.sh.orig	2019-12-09 22:30:04 UTC
++++ build.sh
+@@ -72,7 +72,7 @@ echo -e "${RED}*** ${@}${NC}"
+ 
+ cd `dirname $0`
+ 
+-MAKE_TYPE=make
++MAKE_TYPE=gmake
+ 
+ export CFLAGS='-O -Wall -fPIC'
+ 
+@@ -86,21 +86,14 @@ case $OS in
+ 		MAKEFILE=make_win32.mak
  		;;
-+	"DragonFly")
-+		SWT_OS=dragonfly
-+		MAKEFILE=make_dragonfly.mak
-+		if uname -p > /dev/null 2>&1; then
-+			MODEL=`uname -p`
-+		fi
-+		;;
- 	"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:]'`
++		SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'`
+ 		MAKEFILE=make_linux.mak
  		;;
- 	"Windows_NT")
- 		SWT_OS=win32
-@@ -469,10 +479,10 @@
+ esac
  
+ # Determine which CPU type we are building for
+ if [ "${MODEL}" = "" ]; then
+-	if uname -i > /dev/null 2>&1; then
+-		MODEL=`uname -i`
+-		if [ ${MODEL} = 'unknown' ]; then
+-		  MODEL=`uname -m`
+-		fi
+-	else
+ 		MODEL=`uname -m`
+-	fi
+ fi
+ case $MODEL in
+ 	"x86_64")
+@@ -111,6 +104,11 @@ case $MODEL in
+ 		SWT_ARCH=x86
+ 		AWT_ARCH=i386
+ 		;;
++	"powerpc" | "powerpc64")
++		SWT_ARCH=ppc64
++		AWT_ARCH=ppc64
++		MODEL=`uname -p`
++		;;
+ 	*)
+ 		SWT_ARCH=$MODEL
+ 		AWT_ARCH=$MODEL
+@@ -194,7 +192,7 @@ esac
  
+ 
  # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparcv9'  -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64'  -o ${MODEL} = 'amd64' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
++if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
  	if [ -d /lib64 ]; then
--		XLIB64=-L/usr/X11R6/lib64
-+		XLIB64=-L${LOCALBASE}/lib64
- 		export XLIB64
+ 		XLIB64=-L/usr/X11R6/lib64
+@@ -205,6 +203,11 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MOD
+ 		XLIB64="${XLIB64} -L/usr/lib64"
+ 		SWT_LFLAGS=-m64
+ 		export SWT_LFLAGS
++	fi
++	if [ ${SWT_OS} = "freebsd" ]
++	then
++		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
++		export SWT_LFLAGS=-m64
  	fi
- 	if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
-@@ -517,37 +527,24 @@
- 	export SWT_LFLAGS SWT_PTR_CFLAGS
+ 	export SWT_PTR_CFLAGS
  fi
- 
--
-+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then
- if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
- 	func_echo_plus "Cairo found, compiling SWT support for the cairo graphics library."
- 	MAKE_CAIRO=make_cairo
- else
- 	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
- fi
-+fi
- 
--if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; 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`
--		export MOZILLA_INCLUDES
--		export MOZILLA_LIBS
--		MAKE_MOZILLA=make_mozilla
--	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
--		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
--		XULRUNNER_LIBS=`pkg-config --libs libxul`
--		export XULRUNNER_INCLUDES
--		export XULRUNNER_LIBS
--		MAKE_MOZILLA=make_xulrunner
--	else
--		func_echo_error "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
--		func_echo_error "   >> Mozilla embedding support will not be compiled."
--	fi
-+if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then
-+	echo "Using libxul for gecko support"
-+	XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding`
-+	XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding`
-+	export XULRUNNER_INCLUDES
-+	export XULRUNNER_LIBS
-+else
-+	echo "None of the following libraries were found:  XULRunner/XPCOM"
-+	echo "    *** Mozilla embedding support will not be compiled."
- fi
- 
- # Find AWT if available