Using libicuuc.a seems to make jikes more unstable. Since this is supposed

to be the stable version, stop using it. Folks who need it can use the
"jikes-devel" port.

3 files changed, 1 insertions, 46 deletions

diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index ab4232400f47..5b8c92e9cb91 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -7,18 +7,12 @@
 
 PORTNAME=	jikes
 PORTVERSION=	1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java
 MASTER_SITES=	http://oss.software.ibm.com/pub/jikes/
 
 MAINTAINER=	archie@freebsd.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libicuuc.a:${PORTSDIR}/devel/icu
-
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		CPPFLAGS="-D_THREAD_SAFE -I${PREFIX}/include" \
-		LDFLAGS="-pthread -L${PREFIX}/lib"
-
 MAN1=		jikes.1
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
diff --git a/java/jikes/files/patch-ab b/java/jikes/files/patch-ab
deleted file mode 100644
index a14051df4473..000000000000
--- a/java/jikes/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Tue Aug 27 12:55:14 2002
-+++ configure	Tue Aug 27 12:54:33 2002
-@@ -4279,13 +4279,13 @@
- 
- fi
- 
--echo "$as_me:4282: checking for u_getVersion in -licu-uc" >&5
--echo $ECHO_N "checking for u_getVersion in -licu-uc... $ECHO_C" >&6
-+echo "$as_me:4282: checking for u_getVersion in -licuuc" >&5
-+echo $ECHO_N "checking for u_getVersion in -licuuc... $ECHO_C" >&6
- if test "${ac_cv_lib_icu_uc_u_getVersion+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-licu-uc  $LIBS"
-+LIBS="-licuuc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 4290 "configure"
- #include "confdefs.h"
-@@ -4333,7 +4333,7 @@
- #define HAVE_LIBICU_UC 1
- EOF
- 
--  LIBS="-licu-uc $LIBS"
-+  LIBS="-licuuc $LIBS"
- 
- fi
- 
diff --git a/java/jikes/files/patch-ac b/java/jikes/files/patch-ac
deleted file mode 100644
index b43dedce4e7e..000000000000
--- a/java/jikes/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Tue Aug 27 12:55:18 2002
-+++ configure.in	Tue Aug 27 12:54:39 2002
-@@ -108,7 +108,7 @@
- AC_CHECK_ICONV()
- 
- dnl	Check if "IBM Classes for UNICODE library" is present
--AC_CHECK_LIB(icu-uc, u_getVersion)
-+AC_CHECK_LIB(icuuc, u_getVersion)
- 
- dnl	Check for cygwin path conversion functions
- AC_CHECK_FUNCS(cygwin_win32_to_posix_path_list)