aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2018-12-03 13:36:05 +0000
committerRene Ladan <rene@FreeBSD.org>2018-12-03 13:36:05 +0000
commit80239377e351b1639b182c344529fe7332bbef6b (patch)
tree3eb6fa0b55d299cf1f3f07a4f7031dc5a833cc60 /java
parent01dda89fab626393d9fdccd33682898b379c3549 (diff)
downloadports-80239377e351b1639b182c344529fe7332bbef6b.tar.gz
ports-80239377e351b1639b182c344529fe7332bbef6b.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/Makefile3
-rw-r--r--java/cacao/Makefile61
-rw-r--r--java/cacao/distinfo2
-rw-r--r--java/cacao/files/gcj.patch20
-rw-r--r--java/cacao/files/patch-boehm-gc__configure10
-rw-r--r--java/cacao/files/patch-boehm-gc__dbg_ml.c76
-rw-r--r--java/cacao/files/patch-boehm-gc__include__gc.h10
-rw-r--r--java/cacao/files/patch-boehm-gc__include__private__gcconfig.h89
-rw-r--r--java/cacao/files/patch-configure11
-rw-r--r--java/cacao/files/patch-src__cacao__cacao.cpp14
-rw-r--r--java/cacao/files/patch-src__threads__posix__thread-posix.cpp11
-rw-r--r--java/cacao/files/patch-src__threads__thread.cpp11
-rw-r--r--java/cacao/files/patch-src__vm__jit__i386__freebsd__md-os.cpp334
-rw-r--r--java/cacao/files/patch-src__vm__jit__x86_64__freebsd__md-os.cpp216
-rw-r--r--java/cacao/files/patch-src__vm__properties.cpp50
-rw-r--r--java/cacao/pkg-descr4
-rw-r--r--java/cacao/pkg-plist4
-rw-r--r--java/classpath/Makefile147
-rw-r--r--java/classpath/distinfo6
-rw-r--r--java/classpath/files/patch-lib__Makefile.in11
-rw-r--r--java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c21
-rw-r--r--java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c14
-rw-r--r--java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c18
-rw-r--r--java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java27
-rw-r--r--java/classpath/pkg-descr5
-rw-r--r--java/classpath/pkg-plist180
-rw-r--r--java/jamvm/Makefile50
-rw-r--r--java/jamvm/distinfo2
-rw-r--r--java/jamvm/files/patch-configure75
-rw-r--r--java/jamvm/pkg-descr8
-rw-r--r--java/jamvm/pkg-plist24
31 files changed, 0 insertions, 1514 deletions
diff --git a/java/Makefile b/java/Makefile
index 077c10c54767..cf4b9b2185e8 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -11,9 +11,7 @@
SUBDIR += bootstrap-openjdk8
SUBDIR += bouncycastle
SUBDIR += bouncycastle15
- SUBDIR += cacao
SUBDIR += castor
- SUBDIR += classpath
SUBDIR += cos
SUBDIR += cryptix-jce
SUBDIR += dbvis
@@ -53,7 +51,6 @@
SUBDIR += jakarta-commons-primitives
SUBDIR += jakarta-oro
SUBDIR += jakarta-regexp
- SUBDIR += jamvm
SUBDIR += jasmin
SUBDIR += jattach
SUBDIR += java-checkstyle
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
deleted file mode 100644
index 91082231aa33..000000000000
--- a/java/cacao/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Tilman Keskinoz <arved@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= cacao
-PORTVERSION= 1.6.1
-PORTREVISION= 1
-CATEGORIES= java devel
-MASTER_SITES= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/
-
-MAINTAINER= java@FreeBSD.org
-COMMENT= JIT compiler for JAVA
-
-LICENSE= GPLv2
-
-ONLY_FOR_ARCHS= amd64 i386
-
-BUILD_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:java/classpath
-RUN_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:java/classpath
-
-USES= gmake tar:xz
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS= --disable-test-dependency-checks \
- --with-java-runtime-library=gnuclasspath \
- --with-java-runtime-library-prefix=${PREFIX} \
- --with-build-java-runtime-library-classes=${LOCALBASE}/share/classpath/glibj.zip
-CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}"
-
-OPTIONS_DEFINE= JDK
-OPTIONS_DEFAULT=JDK
-JDK_DESC= Build with native JDK
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJDK}
-BUILD_DEPENDS+= ${LOCALBASE}/bootstrap-openjdk6/bin/javac:java/bootstrap-openjdk6
-JAR= ${LOCALBASE}/bootstrap-openjdk6/bin/jar
-JAVAC= ${LOCALBASE}/bootstrap-openjdk6/bin/javac
-.else
-GCC_SUFX?= 46
-BUILD_DEPENDS+= gcj${GCC_SUFX}:lang/gcc${GCC_SUFX}
-EXTRA_PATCHES= ${FILESDIR}/gcj.patch
-JAR= ${LOCALBASE}/bin/gjar${GCC_SUFX}
-JAVAC= ${LOCALBASE}/bin/gcj${GCC_SUFX}
-JAVACFLAGS= -C
-CONFIGURE_ENV+= JAVACFLAGS="${JAVACFLAGS}"
-MAKE_ENV+= JAVACFLAGS="${JAVACFLAGS}"
-.endif
-
-do-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/src/cacao/cacao \
- ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_LIB} ${WRKSRC}/src/cacao/.libs/libjvm.so \
- ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/src/classes/vm.zip \
- ${STAGEDIR}${DATADIR}
- ${INSTALL_MAN} ${WRKSRC}/man/cacao.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/java/cacao/distinfo b/java/cacao/distinfo
deleted file mode 100644
index 50906d499ea1..000000000000
--- a/java/cacao/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cacao-1.6.1.tar.xz) = eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12
-SIZE (cacao-1.6.1.tar.xz) = 2329964
diff --git a/java/cacao/files/gcj.patch b/java/cacao/files/gcj.patch
deleted file mode 100644
index caedccf7f2f4..000000000000
--- a/java/cacao/files/gcj.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/classes/Makefile.in.orig 2012-09-03 12:10:18.000000000 -0400
-+++ src/classes/Makefile.in 2012-10-05 15:41:54.000000000 -0400
-@@ -531,7 +531,7 @@
-
- @ENABLE_ZLIB_TRUE@vm.zip: $(VM_JAVA_FILES)
- @ENABLE_ZLIB_TRUE@ $(mkdir_p) classes
--@ENABLE_ZLIB_TRUE@ $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
-+@ENABLE_ZLIB_TRUE@ $(JAVAC) $(JAVACFLAGS) --bootclasspath=$(BOOTCLASSPATH) -fsource=1.5 -ftarget=1.5 -d classes $(VM_JAVA_FILES)
- @ENABLE_ZLIB_TRUE@ @if test "$(JAR)" = "zip" -o "$(JAR)" = "zip.exe"; then \
- @ENABLE_ZLIB_TRUE@ cd classes && $(JAR) -r -D $(VM_ZIP) .; \
- @ENABLE_ZLIB_TRUE@ else \
-@@ -539,7 +539,7 @@
- @ENABLE_ZLIB_TRUE@ fi
- @ENABLE_ZLIB_FALSE@nozip: $(VM_JAVA_FILES)
- @ENABLE_ZLIB_FALSE@ $(mkdir_p) classes
--@ENABLE_ZLIB_FALSE@ $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
-+@ENABLE_ZLIB_FALSE@ $(JAVAC) $(JAVACFLAGS) --bootclasspath=$(BOOTCLASSPATH) -fsource=1.5 -ftarget=1.5 -d classes $(VM_JAVA_FILES)
-
- @ENABLE_ZLIB_FALSE@install-data-local: nozip
- @ENABLE_ZLIB_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
diff --git a/java/cacao/files/patch-boehm-gc__configure b/java/cacao/files/patch-boehm-gc__configure
deleted file mode 100644
index fa6ac04df761..000000000000
--- a/java/cacao/files/patch-boehm-gc__configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mm/boehm-gc/configure.orig 2012-09-03 12:10:04.000000000 -0400
-+++ src/mm/boehm-gc/configure 2012-09-19 14:42:52.000000000 -0400
-@@ -5063,6 +5063,7 @@
- $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
-
- INCLUDES="$INCLUDES -pthread"
-+ THREADDLLIBS=-lpthread
- ;;
- *-*-kfreebsd*-gnu)
- $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
diff --git a/java/cacao/files/patch-boehm-gc__dbg_ml.c b/java/cacao/files/patch-boehm-gc__dbg_ml.c
deleted file mode 100644
index 216ff347a3e2..000000000000
--- a/java/cacao/files/patch-boehm-gc__dbg_ml.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/mm/boehm-gc/dbg_mlc.c.orig 2012-09-03 12:10:00.000000000 -0400
-+++ src/mm/boehm-gc/dbg_mlc.c 2012-09-19 13:02:15.000000000 -0400
-@@ -466,10 +466,34 @@
- GC_register_displacement((word)sizeof(oh) + offset);
- }
-
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+static void GC_caller_func_offset(ad, symp, offp)
-+const GC_word ad;
-+const char **symp;
-+int *offp;
-+{
-+ Dl_info caller;
-+ if (dladdr((const void *)ad, &caller) && caller.dli_sname != NULL) {
-+ *symp = caller.dli_sname;
-+ *offp = (const char *)ad - (const char *)caller.dli_saddr;
-+ }
-+}
-+#else
-+#define GC_caller_func(ad, symp, offp)
-+#endif
-+
- GC_API void * GC_CALL GC_debug_malloc(size_t lb, GC_EXTRA_PARAMS)
- {
- void * result = GC_malloc(lb + DEBUG_BYTES);
-
-+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (result == 0) {
- GC_err_printf("GC_debug_malloc(%lu) returning NIL (",
- (unsigned long) lb);
-@@ -792,6 +816,13 @@
- size_t old_sz;
- hdr * hhdr;
-
-+#ifdef GC_ADD_CALLER
-+ if (s == NULL) {
-+ GC_caller_func_offset(ra, &s, &i);
-+ if (s == NULL)
-+ s = "unknown";
-+ }
-+#endif
- if (p == 0) return(GC_debug_malloc(lb, OPT_RA s, i));
- base = GC_base(p);
- if (base == 0) {
-@@ -1098,17 +1129,21 @@
- }
-
- #ifdef GC_ADD_CALLER
--# define RA GC_RETURN_ADDR,
-+# ifdef GC_RETURN_ADDR_PARENT
-+# define RA GC_RETURN_ADDR_PARENT,
-+# else
-+# define RA GC_RETURN_ADDR,
-+# endif
- #else
- # define RA
- #endif
-
- GC_API void * GC_CALL GC_debug_malloc_replacement(size_t lb)
- {
-- return GC_debug_malloc(lb, RA "unknown", 0);
-+ return GC_debug_malloc(lb, RA NULL, 0);
- }
-
- GC_API void * GC_CALL GC_debug_realloc_replacement(void *p, size_t lb)
- {
-- return GC_debug_realloc(p, lb, RA "unknown", 0);
-+ return GC_debug_realloc(p, lb, RA NULL, 0);
- }
diff --git a/java/cacao/files/patch-boehm-gc__include__gc.h b/java/cacao/files/patch-boehm-gc__include__gc.h
deleted file mode 100644
index 0e1cc9c18294..000000000000
--- a/java/cacao/files/patch-boehm-gc__include__gc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/boehm-gc/include/gc.h.orig Wed Jun 4 17:07:33 2003
-+++ src/mm/boehm-gc/include/gc.h Wed May 12 20:03:22 2004
-@@ -487,6 +487,7 @@
- /* gcc knows how to retrieve return address, but we don't know */
- /* how to generate call stacks. */
- # define GC_RETURN_ADDR (GC_word)__builtin_return_address(0)
-+# define GC_RETURN_ADDR_PARENT (GC_word)__builtin_return_address(1)
- # else
- /* Just pass 0 for gcc compatibility. */
- # define GC_RETURN_ADDR 0
diff --git a/java/cacao/files/patch-boehm-gc__include__private__gcconfig.h b/java/cacao/files/patch-boehm-gc__include__private__gcconfig.h
deleted file mode 100644
index 49eee7724f36..000000000000
--- a/java/cacao/files/patch-boehm-gc__include__private__gcconfig.h
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/mm/boehm-gc/include/private/gcconfig.h.orig 2012-09-03 12:10:00.000000000 -0400
-+++ src/mm/boehm-gc/include/private/gcconfig.h 2012-10-05 13:21:12.000000000 -0400
-@@ -69,8 +69,9 @@
- /* Determine the machine type: */
- # if defined(__arm__) || defined(__thumb__)
- # define ARM32
--# if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) \
-- && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__)
-+# if !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) \
-+ && !defined(OPENBSD) && !defined(DARWIN) && !defined(_WIN32) \
-+ && !defined(__CEGCC__)
- # define NOSYS
- # define mach_type_known
- # endif
-@@ -366,6 +367,10 @@
- # define SPARC
- # define mach_type_known
- # endif
-+# if defined(FREEBSD) && defined(__arm__)
-+# define ARM32
-+# define mach_type_known
-+# endif
- # if defined(bsdi) && (defined(i386) || defined(__i386__))
- # define I386
- # define BSDI
-@@ -843,8 +848,6 @@
- # ifndef GC_FREEBSD_THREADS
- # define MPROTECT_VDB
- # endif
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
-@@ -1032,8 +1035,6 @@
- # endif
- # ifdef FREEBSD
- # define OS_TYPE "FREEBSD"
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
-@@ -1284,9 +1285,6 @@
- # define SIG_THR_RESTART (32+5)
- extern int _end[];
- # define DATAEND (ptr_t)(_end)
--# else
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
- # endif
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
-@@ -1608,8 +1606,6 @@
- # ifdef FREEBSD
- # define OS_TYPE "FREEBSD"
- /* MPROTECT_VDB is not yet supported at all on FreeBSD/alpha. */
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
- # define DYNAMIC_LOADING
-@@ -1898,6 +1894,16 @@
- # define DATAEND ((ptr_t)(&_end))
- # define DYNAMIC_LOADING
- # endif
-+# ifdef FREEBSD
-+# define ALIGNMENT 4
-+# define OS_TYPE "FREEBSD"
-+# ifdef __ELF__
-+# define DYNAMIC_LOADING
-+# endif
-+# define HEURISTIC2
-+ extern char etext[];
-+# define SEARCH_FOR_DATA_START
-+# endif
- # ifdef NOSYS
- /* __data_start is usually defined in the target linker script. */
- extern int __data_start[];
-@@ -2066,9 +2072,6 @@
- # define SIG_THR_RESTART (32+5)
- extern int _end[];
- # define DATAEND (ptr_t)(_end)
--# else
--# define SIG_SUSPEND SIGUSR1
--# define SIG_THR_RESTART SIGUSR2
- # endif
- # define FREEBSD_STACKBOTTOM
- # ifdef __ELF__
diff --git a/java/cacao/files/patch-configure b/java/cacao/files/patch-configure
deleted file mode 100644
index 3f19ca642014..000000000000
--- a/java/cacao/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2012-09-03 12:10:16.000000000 -0400
-+++ configure 2012-09-19 19:08:48.000000000 -0400
-@@ -3626,7 +3626,7 @@
- JAVA_ARCH="sparc"
- ;;
-
--x86_64 )
-+x86_64 | amd64 )
- ARCH_DIR="x86_64"
- ARCH_FLAGS="-m64 -D__X86_64__"
- JAVA_ARCH="amd64"
diff --git a/java/cacao/files/patch-src__cacao__cacao.cpp b/java/cacao/files/patch-src__cacao__cacao.cpp
deleted file mode 100644
index 99980c72f0e1..000000000000
--- a/java/cacao/files/patch-src__cacao__cacao.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/cacao/cacao.cpp.orig 2012-09-03 12:10:00.000000000 -0400
-+++ src/cacao/cacao.cpp 2012-10-04 14:34:51.000000000 -0400
-@@ -90,7 +90,11 @@
-
- path = (char*) os::malloc(sizeof(char) * 4096);
-
-+# if defined(__FreeBSD__)
-+ if (readlink("/proc/curproc/file", path, 4095) == -1) {
-+# else
- if (readlink("/proc/self/exe", path, 4095) == -1) {
-+# endif
- fprintf(stderr, "main: readlink failed: %s\n", strerror(errno));
- os::abort();
- }
diff --git a/java/cacao/files/patch-src__threads__posix__thread-posix.cpp b/java/cacao/files/patch-src__threads__posix__thread-posix.cpp
deleted file mode 100644
index 7fb8258e83cb..000000000000
--- a/java/cacao/files/patch-src__threads__posix__thread-posix.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/threads/posix/thread-posix.cpp.orig 2012-09-03 12:10:00.000000000 -0400
-+++ src/threads/posix/thread-posix.cpp 2012-10-04 16:42:49.000000000 -0400
-@@ -94,6 +94,8 @@
-
- #if defined(__LINUX__)
- # define GC_LINUX_THREADS
-+#elif defined(__FREEBSD__)
-+# define GC_FREEBSD_THREADS
- #elif defined(__IRIX__)
- # define GC_IRIX_THREADS
- #elif defined(__DARWIN__)
diff --git a/java/cacao/files/patch-src__threads__thread.cpp b/java/cacao/files/patch-src__threads__thread.cpp
deleted file mode 100644
index 8c3129188a93..000000000000
--- a/java/cacao/files/patch-src__threads__thread.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/threads/thread.cpp.orig 2013-06-28 09:22:26.000000000 -0400
-+++ src/threads/thread.cpp 2013-07-08 15:41:56.000000000 -0400
-@@ -51,6 +51,8 @@
- #if defined(ENABLE_GC_BOEHM)
- # if defined(__LINUX__)
- # define GC_LINUX_THREADS
-+# elif defined(__FREEBSD__)
-+# define GC_FREEBSD_THREADS
- # elif defined(__IRIX__)
- # define GC_IRIX_THREADS
- # elif defined(__DARWIN__)
diff --git a/java/cacao/files/patch-src__vm__jit__i386__freebsd__md-os.cpp b/java/cacao/files/patch-src__vm__jit__i386__freebsd__md-os.cpp
deleted file mode 100644
index 27513e080a7e..000000000000
--- a/java/cacao/files/patch-src__vm__jit__i386__freebsd__md-os.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
---- src/vm/jit/i386/freebsd/md-os.cpp.orig 2013-06-28 09:22:26.000000000 -0400
-+++ src/vm/jit/i386/freebsd/md-os.cpp 2013-07-08 16:02:06.000000000 -0400
-@@ -2,6 +2,7 @@
-
- Copyright (C) 1996-2013
- CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-+ Copyright (C) 2009 Theobroma Systems Ltd.
-
- This file is part of CACAO.
-
-@@ -35,218 +36,55 @@
-
- #include "threads/thread.hpp"
-
--#include "vm/jit/builtin.hpp"
- #include "vm/signallocal.hpp"
-
--#include "vm/jit/asmpart.hpp"
- #include "vm/jit/executionstate.hpp"
--#include "vm/jit/stacktrace.hpp"
- #include "vm/jit/trap.hpp"
-
-
--/* md_signal_handler_sigsegv ***************************************************
--
-- Signal handler for hardware exceptions.
--
--*******************************************************************************/
--
-+/**
-+ * Signal handler for hardware exceptions.
-+ */
- void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
- {
-- ucontext_t *_uc;
-- mcontext_t *_mc;
-- u1 *pv;
-- u1 *sp;
-- u1 *ra;
-- u1 *xpc;
-- u1 opc;
-- u1 mod;
-- u1 rm;
-- s4 d;
-- s4 disp;
-- ptrint val;
-- s4 type;
-- void *p;
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- _uc = (ucontext_t *) _p;
-- _mc = &_uc->uc_mcontext;
-+ void* xpc = (void*) _mc->mc_eip;
-
-- pv = NULL; /* is resolved during stackframeinfo creation */
-- sp = (u1 *) _mc->mc_esp;
-- xpc = (u1 *) _mc->mc_eip;
-- ra = xpc; /* return address is equal to XPC */
--
-- /* get exception-throwing instruction */
--
-- opc = M_ALD_MEM_GET_OPC(xpc);
-- mod = M_ALD_MEM_GET_MOD(xpc);
-- rm = M_ALD_MEM_GET_RM(xpc);
--
-- /* for values see emit_mov_mem_reg and emit_mem */
--
-- if ((opc == 0x8b) && (mod == 0) && (rm == 5)) {
-- /* this was a hardware-exception */
--
-- d = M_ALD_MEM_GET_REG(xpc);
-- disp = M_ALD_MEM_GET_DISP(xpc);
--
-- /* we use the exception type as load displacement */
--
-- type = disp;
--
-- switch (d) {
-- case EAX:
-- val = _mc->mc_eax;
-- break;
-- case ECX:
-- val = _mc->mc_ecx;
-- break;
-- case EDX:
-- val = _mc->mc_edx;
-- break;
-- case EBX:
-- val = _mc->mc_ebx;
-- break;
-- case ESP:
-- val = _mc->mc_esp;
-- break;
-- case EBP:
-- val = _mc->mc_ebp;
-- break;
-- case ESI:
-- val = _mc->mc_esi;
-- break;
-- case EDI:
-- val = _mc->mc_edi;
-- break;
-- default:
-- vm_abort("md_signal_handler_sigsegv: Unkown register %d", d);
-- }
--
-- if (type == TRAP_COMPILER) {
-- /* The PV from the compiler stub is equal to the XPC. */
--
-- pv = xpc;
--
-- /* We use a framesize of zero here because the call pushed
-- the return addres onto the stack. */
--
-- ra = md_stacktrace_get_returnaddress(sp, 0);
--
-- /* Skip the RA on the stack. */
--
-- sp = sp + 1 * SIZEOF_VOID_P;
--
-- /* The XPC is the RA minus 2, because the RA points to the
-- instruction after the call. */
--
-- xpc = ra - 2;
-- }
-- }
-- else {
-- /* this was a normal NPE */
--
-- type = TRAP_NullPointerException;
-- val = 0;
-- }
--
-- /* Handle the trap. */
--
-- p = trap_handle(type, val, pv, sp, ra, xpc, _p);
--
-- /* Set registers. */
--
-- if (type == TRAP_COMPILER) {
-- if (p == NULL) {
-- _mc->mc_esp = (uintptr_t) sp; // Remove RA from stack.
-- }
-- }
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGSEGV, xpc, _p);
- }
-
-
--/* md_signal_handler_sigfpe ****************************************************
--
-- ArithmeticException signal handler for hardware divide by zero
-- check.
--
--*******************************************************************************/
--
-+/**
-+ * Signal handler for hardware divide by zero (ArithmeticException)
-+ * check.
-+ */
- void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
- {
-- ucontext_t *_uc;
-- mcontext_t *_mc;
-- u1 *pv;
-- u1 *sp;
-- u1 *ra;
-- u1 *xpc;
-- s4 type;
-- ptrint val;
--
-- _uc = (ucontext_t *) _p;
-- _mc = &_uc->uc_mcontext;
--
-- pv = NULL; /* is resolved during stackframeinfo creation */
-- sp = (u1 *) _mc->mc_esp;
-- xpc = (u1 *) _mc->mc_eip;
-- ra = xpc; /* return address is equal to xpc */
--
-- /* This is an ArithmeticException. */
--
-- type = TRAP_ArithmeticException;
-- val = 0;
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- /* Handle the trap. */
-+ void* xpc = (void*) _mc->mc_eip;
-
-- trap_handle(type, val, pv, sp, ra, xpc, _p);
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGFPE, xpc, _p);
- }
-
-
--/* md_signal_handler_sigill ****************************************************
--
-- Signal handler for hardware patcher traps (ud2).
--
--*******************************************************************************/
--
-+/**
-+ * Signal handler for hardware patcher traps (ud2).
-+ */
- void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
- {
-- ucontext_t *_uc;
-- mcontext_t *_mc;
-- u1 *pv;
-- u1 *sp;
-- u1 *ra;
-- u1 *xpc;
-- s4 type;
-- ptrint val;
--
-- _uc = (ucontext_t *) _p;
-- _mc = &_uc->uc_mcontext;
--
-- pv = NULL; /* is resolved during stackframeinfo creation */
-- sp = (u1 *) _mc->mc_esp;
-- xpc = (u1 *) _mc->mc_eip;
-- ra = xpc; /* return address is equal to xpc */
--
-- // Check if the trap instruction is valid.
-- // TODO Move this into patcher_handler.
-- if (patcher_is_valid_trap_instruction_at(xpc) == false) {
-- // Check if the PC has been patched during our way to this
-- // signal handler (see PR85).
-- if (patcher_is_patched_at(xpc) == true)
-- return;
--
-- // We have a problem...
-- log_println("md_signal_handler_sigill: Unknown illegal instruction at 0x%lx", xpc);
--#if defined(ENABLE_DISASSEMBLER)
-- (void) disassinstr(xpc);
--#endif
-- vm_abort("Aborting...");
-- }
--
-- type = TRAP_PATCHER;
-- val = 0;
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- /* Handle the trap. */
-+ void* xpc = (void*) _mc->mc_eip;
-
-- trap_handle(type, val, pv, sp, ra, xpc, _p);
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGILL, xpc, _p);
- }
-
-
-@@ -282,17 +120,21 @@
-
- *******************************************************************************/
-
--void md_executionstate_read(executionstate_t* es, void* context)
-+void md_executionstate_read(executionstate_t *es, void *context)
- {
-- ucontext_t* _uc = (ucontext_t*) context;
-- mcontext_t* _mc = &_uc->uc_mcontext;
-+ ucontext_t *_uc;
-+ mcontext_t *_mc;
-+ s4 i;
-
-- // Read special registers.
-+ _uc = (ucontext_t *) context;
-+ _mc = &_uc->uc_mcontext;
-+
-+ /* read special registers */
- es->pc = (u1 *) _mc->mc_eip;
- es->sp = (u1 *) _mc->mc_esp;
- es->pv = NULL; /* pv must be looked up via AVL tree */
-
-- // Read integer registers.
-+ /* read integer registers */
- es->intregs[EAX] = _mc->mc_eax;
- es->intregs[ECX] = _mc->mc_ecx;
- es->intregs[EDX] = _mc->mc_edx;
-@@ -302,8 +144,8 @@
- es->intregs[ESI] = _mc->mc_esi;
- es->intregs[EDI] = _mc->mc_edi;
-
-- // Read float registers.
-- for (int i = 0; i < FLT_REG_CNT; i++)
-+ /* read float registers */
-+ for (i = 0; i < FLT_REG_CNT; i++)
- es->fltregs[i] = 0xdeadbeefdeadbeefULL;
- }
-
-@@ -314,12 +156,15 @@
-
- *******************************************************************************/
-
--void md_executionstate_write(executionstate_t* es, void* context)
-+void md_executionstate_write(executionstate_t *es, void *context)
- {
-- ucontext_t* _uc = (ucontext_t*) context;
-- mcontext_t* _mc = &_uc->uc_mcontext;
-+ ucontext_t *_uc;
-+ mcontext_t *_mc;
-+
-+ _uc = (ucontext_t *) context;
-+ _mc = &_uc->uc_mcontext;
-
-- // Write integer registers.
-+ /* write integer registers */
- _mc->mc_eax = es->intregs[EAX];
- _mc->mc_ecx = es->intregs[ECX];
- _mc->mc_edx = es->intregs[EDX];
-@@ -329,9 +174,9 @@
- _mc->mc_esi = es->intregs[ESI];
- _mc->mc_edi = es->intregs[EDI];
-
-- // Write special registers.
-- _mc->mc_eip = (uintptr_t) es->pc;
-- _mc->mc_esp = (uintptr_t) es->sp;
-+ /* write special registers */
-+ _mc->mc_eip = (ptrint) es->pc;
-+ _mc->mc_esp = (ptrint) es->sp;
- }
-
-
-@@ -341,7 +186,7 @@
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
-- * mode: c
-+ * mode: c++
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
diff --git a/java/cacao/files/patch-src__vm__jit__x86_64__freebsd__md-os.cpp b/java/cacao/files/patch-src__vm__jit__x86_64__freebsd__md-os.cpp
deleted file mode 100644
index 0e178889bab1..000000000000
--- a/java/cacao/files/patch-src__vm__jit__x86_64__freebsd__md-os.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/vm/jit/x86_64/freebsd/md-os.cpp.orig 2013-06-28 09:22:27.000000000 -0400
-+++ src/vm/jit/x86_64/freebsd/md-os.cpp 2013-07-08 16:05:56.000000000 -0400
-@@ -2,7 +2,6 @@
-
- Copyright (C) 1996-2013
- CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
-- Copyright (C) 2009 Theobroma Systems Ltd.
-
- This file is part of CACAO.
-
-@@ -28,79 +27,65 @@
-
- #include <cassert>
- #include <cstdlib>
-+#include <stdint.h>
- #include <ucontext.h>
-
--#include "threads/thread.hpp"
--
--#include "vm/signallocal.hpp"
-+#include "vm/types.hpp"
-
--#include "vm/jit/asmpart.hpp"
--#include "vm/jit/stacktrace.hpp"
-+#include "vm/jit/x86_64/codegen.hpp"
-+#include "vm/jit/x86_64/md.hpp"
-
-+#include "threads/thread.hpp"
-
--/* md_signal_handler_sigsegv ***************************************************
-+#include "vm/signallocal.hpp"
-
-- NullPointerException signal handler for hardware null pointer
-- check.
-+#include "vm/jit/executionstate.hpp"
-+#include "vm/jit/trap.hpp"
-
--*******************************************************************************/
-
-+/**
-+ * Signal handler for hardware exception.
-+ */
- void md_signal_handler_sigsegv(int sig, siginfo_t *siginfo, void *_p)
- {
-- ucontext_t *_uc;
-- mcontext_t *_mc;
-- u1 *sp;
-- u1 *ra;
-- u1 *xpc;
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- _uc = (ucontext_t *) _p;
-- _mc = &_uc->uc_mcontext;
-+ void* xpc = (void*) _mc->mc_rip;
-
-- sp = (u1 *) _mc->mc_rsp;
-- xpc = (u1 *) _mc->mc_rip;
-- ra = xpc; /* return address is equal to xpc */
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGSEGV, xpc, _p);
-+}
-
--#if 0
-- /* check for StackOverflowException */
-
-- threads_check_stackoverflow(sp);
--#endif
-+/**
-+ * ArithmeticException signal handler for hardware divide by zero
-+ * check.
-+ */
-+void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
-+{
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- _mc->mc_rax =
-- (ptrint) stacktrace_hardware_nullpointerexception(NULL, sp, ra, xpc);
-+ void* xpc = (void*) _mc->mc_rip;
-
-- _mc->mc_r10 = (ptrint) xpc; /* REG_ITMP2_XPC */
-- _mc->mc_rip = (ptrint) asm_handle_exception;
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGFPE, xpc, _p);
- }
-
-
--/* md_signal_handler_sigfpe ****************************************************
--
-- ArithmeticException signal handler for hardware divide by zero
-- check.
--
--*******************************************************************************/
--
--void md_signal_handler_sigfpe(int sig, siginfo_t *siginfo, void *_p)
-+/**
-+ * Signal handler for patchers.
-+ */
-+void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p)
- {
-- ucontext_t *_uc;
-- mcontext_t *_mc;
-- u1 *sp;
-- u1 *ra;
-- u1 *xpc;
--
-- _uc = (ucontext_t *) _p;
-- _mc = &_uc->uc_mcontext;
--
-- sp = (u1 *) _mc->mc_rsp;
-- xpc = (u1 *) _mc->mc_rip;
-- ra = xpc; /* return address is equal to xpc */
-+ ucontext_t* _uc = (ucontext_t *) _p;
-+ mcontext_t* _mc = &_uc->uc_mcontext;
-
-- _mc->mc_rax =
-- (ptrint) stacktrace_hardware_arithmeticexception(NULL, sp, ra, xpc);
-+ void* xpc = (void*) _mc->mc_rip;
-
-- _mc->mc_r10 = (ptrint) xpc; /* REG_ITMP2_XPC */
-- _mc->mc_rip = (ptrint) asm_handle_exception;
-+ // Handle the trap.
-+ trap_handle(TRAP_SIGILL, xpc, _p);
- }
-
-
-@@ -130,6 +115,88 @@
- #endif
-
-
-+/* md_executionstate_read ******************************************************
-+
-+ Read the given context into an executionstate.
-+
-+*******************************************************************************/
-+
-+void md_executionstate_read(executionstate_t *es, void *context)
-+{
-+ ucontext_t *_uc;
-+ mcontext_t *_mc;
-+ s4 i;
-+
-+ _uc = (ucontext_t *) context;
-+ _mc = &_uc->uc_mcontext;
-+
-+ /* read special registers */
-+ es->pc = (u1 *) _mc->mc_rip;
-+ es->sp = (u1 *) _mc->mc_rsp;
-+ es->pv = NULL;
-+
-+ /* read integer registers */
-+ es->intregs[RAX] = _mc->mc_rax;
-+ es->intregs[RCX] = _mc->mc_rcx;
-+ es->intregs[RDX] = _mc->mc_rdx;
-+ es->intregs[RBX] = _mc->mc_rbx;
-+ es->intregs[RSP] = _mc->mc_rsp;
-+ es->intregs[RBP] = _mc->mc_rbp;
-+ es->intregs[RSI] = _mc->mc_rsi;
-+ es->intregs[RDI] = _mc->mc_rdi;
-+ es->intregs[R8] = _mc->mc_r8;
-+ es->intregs[R9] = _mc->mc_r9;
-+ es->intregs[R10] = _mc->mc_r10;
-+ es->intregs[R11] = _mc->mc_r11;
-+ es->intregs[R12] = _mc->mc_r12;
-+ es->intregs[R13] = _mc->mc_r13;
-+ es->intregs[R14] = _mc->mc_r14;
-+ es->intregs[R15] = _mc->mc_r15;
-+
-+ /* read float registers */
-+ for (i = 0; i < FLT_REG_CNT; i++)
-+ es->fltregs[i] = 0xdeadbeefdeadbeefL;
-+}
-+
-+
-+/* md_executionstate_write *****************************************************
-+
-+ Write the given executionstate back to the context.
-+
-+*******************************************************************************/
-+
-+void md_executionstate_write(executionstate_t *es, void *context)
-+{
-+ ucontext_t *_uc;
-+ mcontext_t *_mc;
-+
-+ _uc = (ucontext_t *) context;
-+ _mc = &_uc->uc_mcontext;
-+
-+ /* write integer registers */
-+ _mc->mc_rax = es->intregs[RAX];
-+ _mc->mc_rcx = es->intregs[RCX];
-+ _mc->mc_rdx = es->intregs[RDX];
-+ _mc->mc_rbx = es->intregs[RBX];
-+ _mc->mc_rsp = es->intregs[RSP];
-+ _mc->mc_rbp = es->intregs[RBP];
-+ _mc->mc_rsi = es->intregs[RSI];
-+ _mc->mc_rdi = es->intregs[RDI];
-+ _mc->mc_r8 = es->intregs[R8];
-+ _mc->mc_r9 = es->intregs[R9];
-+ _mc->mc_r10 = es->intregs[R10];
-+ _mc->mc_r11 = es->intregs[R11];
-+ _mc->mc_r12 = es->intregs[R12];
-+ _mc->mc_r13 = es->intregs[R13];
-+ _mc->mc_r14 = es->intregs[R14];
-+ _mc->mc_r15 = es->intregs[R15];
-+
-+ /* write special registers */
-+ _mc->mc_rip = (ptrint) es->pc;
-+ _mc->mc_rsp = (ptrint) es->sp;
-+}
-+
-+
- /*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
diff --git a/java/cacao/files/patch-src__vm__properties.cpp b/java/cacao/files/patch-src__vm__properties.cpp
deleted file mode 100644
index 0421d2403a79..000000000000
--- a/java/cacao/files/patch-src__vm__properties.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/vm/properties.cpp.orig 2013-06-28 09:22:27.000000000 -0400
-+++ src/vm/properties.cpp 2015-01-14 19:18:40.000000000 -0500
-@@ -76,7 +76,11 @@
-
- p = MNEW(char, 4096);
-
-+#if defined(__FreeBSD__)
-+ if (os::readlink("/proc/curproc/file", p, 4095) == -1)
-+#else
- if (os::readlink("/proc/self/exe", p, 4095) == -1)
-+#endif
- os::abort_errno("readlink failed");
-
- /* We have a path like:
-@@ -561,7 +565,7 @@
- void Properties::put(const char* key, const char* value)
- {
- // Try to find the key.
-- std::map<const char*, const char*>::iterator it = _properties.find(key);
-+ std::map<const char*, const char*, ltstr>::iterator it = _properties.find(key);
-
- // The key is already in the map.
- if (it != _properties.end()) {
-@@ -590,7 +594,7 @@
- const char* Properties::get(const char* key)
- {
- // Try to find the key.
-- std::map<const char*, const char*>::iterator it = _properties.find(key);
-+ std::map<const char*, const char*, ltstr>::iterator it = _properties.find(key);
-
- // The key is not in the map.
- if (it == _properties.end())
-@@ -624,7 +628,7 @@
- return;
-
- // Iterator over all properties.
-- for (std::map<const char*, const char*>::iterator it = _properties.begin(); it != _properties.end(); it++) {
-+ for (std::map<const char*, const char*, ltstr>::iterator it = _properties.begin(); it != _properties.end(); it++) {
- // Put into the Java system properties.
- java_handle_t* key = JavaString::from_utf8(it->first);
- java_handle_t* value = JavaString::from_utf8(it->second);
-@@ -641,7 +645,7 @@
- #if !defined(NDEBUG)
- void Properties::dump()
- {
-- for (std::map<const char*, const char*>::iterator it = _properties.begin(); it != _properties.end(); it++) {
-+ for (std::map<const char*, const char*, ltstr>::iterator it = _properties.begin(); it != _properties.end(); it++) {
- log_println("[Properties::dump: key=%s, value=%s]", it->first, it->second);
- }
- }
diff --git a/java/cacao/pkg-descr b/java/cacao/pkg-descr
deleted file mode 100644
index d89f88f0b17f..000000000000
--- a/java/cacao/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-CACAO is a Java Virtual Machine (JVM) which uses Just-In-Time (JIT)
-compilation to execute Java methods natively.
-
-WWW: http://www.cacaojvm.org/
diff --git a/java/cacao/pkg-plist b/java/cacao/pkg-plist
deleted file mode 100644
index 1e4aa9489af3..000000000000
--- a/java/cacao/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/cacao
-lib/libjvm.so
-man/man1/cacao.1.gz
-%%DATADIR%%/vm.zip
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
deleted file mode 100644
index 772d729c71bc..000000000000
--- a/java/classpath/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= classpath
-PORTVERSION= 0.99
-PORTREVISION= 9
-CATEGORIES= java devel
-MASTER_SITES= GNU \
- SAVANNAH
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER= java@FreeBSD.org
-COMMENT= GNU project to create a free Java class library
-
-DEPRECATED= Staled since 2012, OpenJDK is live now
-EXPIRATION_DATE= 2018-12-02
-
-LICENSE= GPLv2
-
-BROKEN_aarch64= fails to configure: error: The jar tool /usr/local/bin/gjar5 was not found
-BROKEN_armv6= fails to configure: error: The jar tool /usr/local/bin/gjar5 was not found
-BROKEN_armv7= fails to configure: error: The jar tool /usr/local/bin/gjar5 was not found
-BROKEN_powerpc64= fails to configure: error: The jar tool /usr/local/bin/gjar5 was not found
-
-GNU_CONFIGURE= yes
-USES= gmake iconv libtool perl5 pkgconfig
-USE_LDCONFIG= yes
-USE_PERL5= build
-USE_XORG= x11 ice xtst xaw xorgproto xext
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi --disable-plugin
-CONFIGURE_ARGS+=--with-jar=${JAR}
-CONFIGURE_ENV= JAVA="${JAVA}" JAVAC="${JAVAC}"
-CONFIGURE_ENV+= JAVACFLAGS="${JAVACFLAGS}"
-MAKE_ENV+= JAVACFLAGS="${JAVACFLAGS}"
-
-INFO= cp-hacking cp-tools cp-vmintegration
-
-CONFLICTS= sablevm-classpath-1.13 sablevm-classpath-1.13_[1-9]
-
-OPTIONS_DEFINE= CAIRO ECJ GCONF GJDOC GMP GTK2 QT4 EXAMPLES
-OPTIONS_DEFAULT=GMP GJDOC GTK2
-CAIRO_DESC= Use Gtk+ Cairo based Graphics2D
-ECJ_DESC= Embed ECJ as com.sun.tools.javac
-GJDOC_DESC= Build javadoc replacement
-GMP_DESC= Enable native java.math.BigInteger
-GTK2_DESC= Enable Gtk+ AWT peer
-QT4_DESC= Enable Qt AWT peer
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MECJ}
-MASTER_SITES+= ECLIPSE/R-${ECJ_VERSION}-${ECJ_DROPDATE}:ecj
-DISTFILES+= ${ECJ_JAR}:ecj
-ECJ_VERSION= 3.8.1
-ECJ_DROPDATE= 201209141540
-ECJ_JAR= ecj-${ECJ_VERSION}.jar
-CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR}/${ECJ_JAR}
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-EXAMPLESDIR= ${DATADIR}/examples
-.else
-CONFIGURE_ARGS+= --disable-examples
-.endif
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+= gconf2
-CONFIGURE_ARGS+= --enable-default-preferences-peer=gconf
-PLIST_SUB+= GCONF=""
-.else
-CONFIGURE_ARGS+= --enable-default-preferences-peer=file \
- --disable-gconf-peer
-PLIST_SUB+= GCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGJDOC}
-ANTLR_JAR= antlr-2.7.7.jar
-MASTER_SITES+= http://www.antlr2.org/download/:antlr
-DISTFILES+= ${ANTLR_JAR}:antlr
-CONFIGURE_ARGS+= --with-antlr-jar=${DISTDIR}/${ANTLR_JAR}
-PLIST_SUB+= GJDOC=""
-.else
-CONFIGURE_ARGS+= --disable-gjdoc
-PLIST_SUB+= GJDOC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+= libgmp.so:math/gmp
-CONFIGURE_ARGS+= --with-gmp=${LOCALBASE}
-PLIST_SUB+= GMP=""
-.else
-CONFIGURE_ARGS+= --disable-gmp
-PLIST_SUB+= GMP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+= gtk20
-PLIST_SUB+= GTK2=""
-.if ${PORT_OPTIONS:MCAIRO}
-CONFIGURE_ARGS+= --enable-gtk-cairo
-.endif
-.else
-CONFIGURE_ARGS+= --disable-gtk-peer
-PLIST_SUB+= GTK2="@comment "
-.if ${PORT_OPTIONS:MCAIRO}
-IGNORE=you need to enable the Gtk+ AWT peer in order to use Cairo based Graphics2D.
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-CONFIGURE_ARGS+= --enable-qt-peer
-.if empty(PORT_OPTIONS:MGTK2)
-CONFIGURE_ARGS+= --enable-default-toolkit=gnu.java.awt.peer.qt.QtToolkit
-.endif
-CONFIGURE_ENV+= MOC="${LOCALBASE}/bin/moc-qt4"
-USES+= qt:4
-USE_QT= moc_build corelib gui
-PLIST_SUB+= QT4=""
-.else
-PLIST_SUB+= QT4="@comment "
-.endif
-
-.if !defined(WITH_GCJ) && (${ARCH} == "amd64" || ${ARCH} == "i386")
-BUILD_DEPENDS+= ${LOCALBASE}/bootstrap-openjdk6/bin/javac:java/bootstrap-openjdk6
-JAR?= ${LOCALBASE}/bootstrap-openjdk6/bin/jar
-JAVA?= ${LOCALBASE}/bootstrap-openjdk6/bin/java
-JAVAC?= ${LOCALBASE}/bootstrap-openjdk6/bin/javac
-.else
-USE_BINUTILS= yes
-USE_GCC= yes
-GCC_SUFX= ${_USE_GCC:S/.//}
-JAR?= ${LOCALBASE}/bin/gjar${GCC_SUFX}
-JAVA?= ${LOCALBASE}/bin/gij${GCC_SUFX}
-JAVAC?= ${LOCALBASE}/bin/gcj${GCC_SUFX}
-JAVACFLAGS?= -C
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|@JAVA@|$${JAVACMD:-java}|g' \
- ${WRKSRC}/tools/g*.in
-
-.include <bsd.port.mk>
diff --git a/java/classpath/distinfo b/java/classpath/distinfo
deleted file mode 100644
index 47d339090b79..000000000000
--- a/java/classpath/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (classpath-0.99.tar.gz) = f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8
-SIZE (classpath-0.99.tar.gz) = 11078232
-SHA256 (ecj-3.8.1.jar) = f59808845afaf1aaa5ee35bcf4ec70d465073320fe768f71c1b9fbb3a220ceef
-SIZE (ecj-3.8.1.jar) = 1796325
-SHA256 (antlr-2.7.7.jar) = 88fbda4b912596b9f56e8e12e580cc954bacfb51776ecfddd3e18fc1cf56dc4c
-SIZE (antlr-2.7.7.jar) = 445288
diff --git a/java/classpath/files/patch-lib__Makefile.in b/java/classpath/files/patch-lib__Makefile.in
deleted file mode 100644
index 49fb4086548d..000000000000
--- a/java/classpath/files/patch-lib__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig 2012-03-08 18:54:14.000000000 -0500
-+++ lib/Makefile.in 2012-10-03 18:17:34.000000000 -0400
-@@ -316,7 +316,7 @@
- @INSTALL_GLIBJ_ZIP_TRUE@glibj_DATA = glibj.zip $(COLLECTIONS)
- @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources
- @USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_FALSE@CREATE_GLIBJ_ZIP = $(ZIP) -r -D glibj.zip gnu java javax org sun META-INF > /dev/null
--@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i glibj.zip
-+@USE_PREBUILT_GLIBJ_ZIP_FALSE@@WITH_JAR_TRUE@CREATE_GLIBJ_ZIP = $(JAR) cf glibj.zip gnu java javax org sun META-INF && $(JAR) i $(builddir)/glibj.zip
- #endif
- EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh glibj.zip
- CLEANFILES = compile-classes resources classes \
diff --git a/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c b/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c
deleted file mode 100644
index b07b1bb270d8..000000000000
--- a/java/classpath/files/patch-native__jni__java-io__java_io_VMConsole.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- native/jni/java-io/java_io_VMConsole.c.orig 2012-01-08 07:35:53.000000000 -0500
-+++ native/jni/java-io/java_io_VMConsole.c 2012-09-13 17:35:29.000000000 -0400
-@@ -47,7 +47,7 @@
-
- /*************************************************************************/
-
--#define TERMIOS_ECHO_IFLAGS (IUCLC|IXON|IXOFF|IXANY)
-+#define TERMIOS_ECHO_IFLAGS (IXON|IXOFF|IXANY)
- #define TERMIOS_ECHO_LFLAGS (ECHO|ECHOE|ECHOK|ECHONL|TOSTOP)
-
- /*
-@@ -78,6 +78,9 @@
- tcgetattr (STDIN_FILENO, &new);
-
- new.c_iflag &= ~TERMIOS_ECHO_IFLAGS;
-+#ifdef IUCLC
-+ new.c_iflag &= ~IUCLC;
-+#endif
- new.c_lflag &= ~TERMIOS_ECHO_LFLAGS;
-
- tcsetattr (STDIN_FILENO, TCSANOW, &new);
diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
deleted file mode 100644
index 94e225bf65a5..000000000000
--- a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2013-12-16 09:41:00.000000000 +0100
-+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2013-12-16 09:42:44.000000000 +0100
-@@ -42,8 +42,9 @@
- #include <pango/pango.h>
- #include <pango/pangoft2.h>
- #include <pango/pangofc-font.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- #include "jcl.h"
- #include "gdkfont.h"
- #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
deleted file mode 100644
index 69fc69036461..000000000000
--- a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig 2013-12-16 09:40:51.000000000 +0100
-+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2013-12-16 09:44:06.000000000 +0100
-@@ -39,10 +39,11 @@
- #include <pango/pango.h>
- #include <pango/pangoft2.h>
- #include <pango/pangofc-font.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttypes.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TYPES_H
-+#include FT_TRUETYPE_TABLES_H
- #include "gdkfont.h"
- #include "gtkpeer.h"
- #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"
diff --git a/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java b/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java
deleted file mode 100644
index 9185d8bae3cc..000000000000
--- a/java/classpath/files/patch-tools__gnu__classpath__tools__jar__Updater.java
+++ /dev/null
@@ -1,27 +0,0 @@
---- tools/gnu/classpath/tools/jar/Updater.java.orig 2010-06-03 15:14:36.000000000 -0400
-+++ tools/gnu/classpath/tools/jar/Updater.java 2012-09-20 16:26:23.000000000 -0400
-@@ -70,9 +70,13 @@
- // Set this early so that createManifest can use it.
- inputJar = new JarFile(parameters.archiveFile);
-
-+ // Find the current directory.
-+ File tmpDir = parameters.archiveFile.getParentFile();
-+ if (tmpDir == null)
-+ tmpDir = new File(".");
-+
- // Write all the new entries to a temporary file.
-- File tmpFile = File.createTempFile("jarcopy", null,
-- parameters.archiveFile.getParentFile());
-+ File tmpFile = File.createTempFile("jarcopy", null, tmpDir);
- OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
- writeCommandLineEntries(parameters, os);
-
-@@ -91,7 +95,7 @@
- if (!tmpFile.renameTo(parameters.archiveFile))
- {
- throw new IOException("Couldn't rename new JAR file " + tmpFile +
-- "to " + parameters.archiveFile);
-+ " to " + parameters.archiveFile);
- }
- }
-
diff --git a/java/classpath/pkg-descr b/java/classpath/pkg-descr
deleted file mode 100644
index 9dd1f6d28a26..000000000000
--- a/java/classpath/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GNU Classpath, Essential Libraries for Java, is a GNU project to create free
-core class libraries for use with virtual machines and compilers for the Java
-programming language.
-
-WWW: http://www.classpath.org/
diff --git a/java/classpath/pkg-plist b/java/classpath/pkg-plist
deleted file mode 100644
index 75423bc3f72b..000000000000
--- a/java/classpath/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-bin/gappletviewer
-bin/gjavah
-bin/gjar
-bin/gjarsigner
-%%GJDOC%%bin/gjdoc
-bin/gkeytool
-bin/gnative2ascii
-bin/gorbd
-bin/grmic
-bin/grmid
-bin/grmiregistry
-bin/gserialver
-bin/gtnameserv
-include/jawt.h
-include/jawt_md.h
-include/jni.h
-include/jni_md.h
-%%GCONF%%lib/classpath/libgconfpeer.so
-%%GTK2%%lib/classpath/libgtkpeer.so
-lib/classpath/libjavaio.so
-lib/classpath/libjavaio.so.0
-lib/classpath/libjavaio.so.0.0.0
-lib/classpath/libjavalang.so
-lib/classpath/libjavalang.so.0
-lib/classpath/libjavalang.so.0.0.0
-lib/classpath/libjavalangmanagement.so
-lib/classpath/libjavalangmanagement.so.0
-lib/classpath/libjavalangmanagement.so.0.0.0
-lib/classpath/libjavalangreflect.so
-lib/classpath/libjavalangreflect.so.0
-lib/classpath/libjavalangreflect.so.0.0.0
-lib/classpath/libjavanet.so
-lib/classpath/libjavanet.so.0
-lib/classpath/libjavanet.so.0.0.0
-lib/classpath/libjavanio.so
-lib/classpath/libjavanio.so.0
-lib/classpath/libjavanio.so.0.0.0
-lib/classpath/libjavautil.so
-lib/classpath/libjavautil.so.0
-lib/classpath/libjavautil.so.0.0.0
-%%GMP%%lib/classpath/libjavamath.so
-%%GTK2%%lib/classpath/libjawt.so
-%%QT4%%lib/classpath/libqtpeer.so
-lib/logging.properties
-lib/security/classpath.security
-man/man1/gappletviewer.1.gz
-man/man1/gcjh.1.gz
-man/man1/gjar.1.gz
-man/man1/gjarsigner.1.gz
-man/man1/gjavah.1.gz
-%%GJDOC%%man/man1/gjdoc.1.gz
-man/man1/gkeytool.1.gz
-man/man1/gnative2ascii.1.gz
-man/man1/gorbd.1.gz
-man/man1/grmid.1.gz
-man/man1/grmiregistry.1.gz
-man/man1/gserialver.1.gz
-man/man1/gtnameserv.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.java2d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.jawt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.zip
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/NamingService/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/DemoServer.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoServant.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DemoTester.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/DirectTest.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/RequestTest.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHelper.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPassHolder.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHelper.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturnHolder.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHelper.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNodeHolder.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/README.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/GameManager.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/IorReader.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/Player.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/State.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/X5Server.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/AnimationApplet.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/awt/HintingDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/datatransfer/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/html/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/aicas.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/back.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/badge.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-fullscreen.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-home.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/big-warning.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/palme.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/reload.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-copy.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-cut.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-back.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-down.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-go-forward.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-mic.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-new.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-open.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-paste.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-quit.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-save-as.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-save.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/icons/stock-spell-check.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/J2dBenchmark.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/J2dBenchmarkGUI.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/JNIOverhead.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/bench.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/java2d/bench.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/jawt/DemoJAWT.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/jawt/DemoJAWT.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestBeans.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestClassLoading.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestCompilation.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestGarbageCollector.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemory.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemoryManager.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestMemoryPool.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestOS.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestRuntime.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/management/TestThread.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/midi/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/print/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/sound/AudioPlayerSample.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/BrowserEditorKit.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ButtonDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ComboBoxDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/Demo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DemoDesktop.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DemoFactory.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/DocumentFilterDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/FileChooserDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/HtmlDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ListDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/MetalThemeEditor.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/MiniDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/NavigationFilterDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ProgressBarDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/ScrollBarDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/SliderDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/SpinnerDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TabbedPaneDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TableDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TextAreaDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TextFieldDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/TreeDemo.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/forms.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame1.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame2.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame3.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frame4.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/frames.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/tables.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/textstyles.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/welcome.html
-%%DATADIR%%/glibj.zip
-%%DATADIR%%/tools.zip
diff --git a/java/jamvm/Makefile b/java/jamvm/Makefile
deleted file mode 100644
index 15b7a24b56d5..000000000000
--- a/java/jamvm/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Created by: Bjoern Koenig <bkoenig@alpha-tierchen.de>
-# $FreeBSD$
-
-PORTNAME= jamvm
-PORTVERSION= 1.5.4
-PORTREVISION= 2
-CATEGORIES= java devel
-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Compact Java virtual machine
-
-LICENSE= GPLv2
-
-DEPRECATED= Abandonware
-EXPIRATION_DATE= 2018-12-04
-
-RUN_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:java/classpath
-
-CONFIGURE_ARGS= --with-classpath-install-dir=${LOCALBASE}
-GNU_CONFIGURE= yes
-OPTIONS_SUB= yes
-USES= compiler gmake libtool pkgconfig
-
-OPTIONS_DEFINE= FFI ZIP
-OPTIONS_DEFAULT=FFI ZIP
-FFI_DESC= use libffi to call native methods
-ZIP_DESC= turn-on zip support in the bootstrap loader
-
-FFI_CONFIGURE_ENABLE= ffi
-FFI_LIB_DEPENDS= libffi.so:devel/libffi
-ZIP_BUILD_DEPENDS= zip:archivers/zip
-ZIP_CONFIGURE_ENABLE= zip
-
-.include <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MFFI) && ${ARCH} == "sparc64"
-IGNORE= for ${ARCH} requires libffi
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-CONFIGURE_ARGS+= --disable-int-inlining
-.endif
-
-post-extract:
- @${REINPLACE_CMD} -e "s,\(^include_HEADERS = .*\)jni.h\(.*\),\1\2," ${WRKSRC}/src/Makefile.in
-
-.include <bsd.port.post.mk>
diff --git a/java/jamvm/distinfo b/java/jamvm/distinfo
deleted file mode 100644
index 410facf62f88..000000000000
--- a/java/jamvm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jamvm-1.5.4.tar.gz) = 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124
-SIZE (jamvm-1.5.4.tar.gz) = 656283
diff --git a/java/jamvm/files/patch-configure b/java/jamvm/files/patch-configure
deleted file mode 100644
index 45e93f07d3ce..000000000000
--- a/java/jamvm/files/patch-configure
+++ /dev/null
@@ -1,75 +0,0 @@
---- configure.orig 2009-12-31 13:41:44.000000000 -0500
-+++ configure 2012-09-17 12:29:34.000000000 -0400
-@@ -2683,28 +2683,27 @@
- i[3456]86-*-darwin*) host_cpu=i386 host_os=darwin ;;
- arm*-*-darwin*) host_cpu=arm host_os=darwin libdl_needed=no ;;
- i386-*-openbsd*) host_os=bsd libdl_needed=no ;;
--i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
-+i386-*-freebsd*) os=bsd libdl_needed=no ;;
- i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
- x86_64-*-linux*) host_os=linux ;;
- hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
- mipsel-*-linux*) host_cpu=mips host_os=linux ;;
- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
--x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
-+amd64-*-freebsd*) os=bsd host_cpu=x86_64 libdl_needed=no ;;
- arm*-*-linux*) host_cpu=arm host_os=linux ;;
- arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
--arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
-+arm*-*-freebsd*) host_cpu=arm os=bsd libdl_needed=no ;;
- powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
- powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
--powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
-+powerpc*-*-freebsd*) host_cpu=powerpc os=bsd libdl_needed=no ;;
- powerpc-*-darwin*) host_os=darwin ;;
--sparc*-*-freebsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
-+sparc*-*-freebsd*) host_cpu=sparc os=bsd libdl_needed=no ;;
- *) { { $as_echo "$as_me:$LINENO: error: $host not supported" >&5
- $as_echo "$as_me: error: $host not supported" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-
- arch=$host_cpu
--os=$host_os
-
-
-
-@@ -21662,8 +21661,15 @@
- if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
- $as_echo_n "(cached) " >&6
- else
-+ ac_check_lib_save_CFLAGS=$CFLAGS
-+ ac_check_lib_save_LDFLAGS=$LDFLAGS
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lffi $LIBS"
-+ LIBFFI_CFLAGS="$($PKG_CONFIG libffi --cflags)"
-+ LIBFFI_LDFLAGS="$($PKG_CONFIG libffi --libs-only-L)"
-+ LIBFFI_LIBS="$($PKG_CONFIG libffi --libs-only-l)"
-+CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
-+LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
-+LIBS="$LIBFFI_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21718,6 +21724,8 @@
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+CFLAGS=$ac_check_lib_save_CFLAGS
-+LDFLAGS=$ac_check_lib_save_LDFLAGS
- LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
-@@ -21726,9 +21734,9 @@
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBFFI 1
- _ACEOF
--
-- LIBS="-lffi $LIBS"
--
-+ CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
-+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
-+ LIBS="$LIBFFI_LIBS $LIBS"
- else
- { { $as_echo "$as_me:$LINENO: error: libffi is missing" >&5
- $as_echo "$as_me: error: libffi is missing" >&2;}
diff --git a/java/jamvm/pkg-descr b/java/jamvm/pkg-descr
deleted file mode 100644
index d821aa58e7b8..000000000000
--- a/java/jamvm/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-JamVM is an extremely small Java Virtual Machine which conforms to the
-JVM specification version 2 (blue book).
-
-It is designed to support the full specification, and includes support
-for object finalisation, Soft/Weak/Phantom References, class-unloading,
-the Java Native Interface (JNI) and the Reflection API.
-
-WWW: http://jamvm.sourceforge.net/
diff --git a/java/jamvm/pkg-plist b/java/jamvm/pkg-plist
deleted file mode 100644
index 9a14e5aced4b..000000000000
--- a/java/jamvm/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/jamvm
-lib/libjvm.so
-lib/libjvm.so.0
-lib/libjvm.so.0.0.0
-%%ZIP%%lib/rt.jar
-%%ZIP%%%%DATADIR%%/classes.zip
-%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class
-%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMSystemProperties.class
-%%NO_ZIP%%%%DATADIR%%/classes/jamvm/ThreadInfoHelper.class
-%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/JarLauncher.class
-%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData$Unloader.class
-%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClass.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader$PackageInfo.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMRuntime.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMString.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThread.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThrowable.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMConstructor.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMField.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMMethod.class
-%%NO_ZIP%%%%DATADIR%%/classes/java/security/VMAccessController.class
-%%NO_ZIP%%%%DATADIR%%/classes/sun/reflect/annotation/AnnotationInvocationHandler.class