Split the jikes port into stable and development versions.

PR:		ports/41961
Reviewed by:	freebsd-java

5 files changed, 19 insertions, 21 deletions

diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index e0af4aaef05a..ab4232400f47 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	jikes
-PORTVERSION=	1.16
-PORTREVISION=	3
+PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	http://oss.software.ibm.com/pub/jikes/
 
@@ -17,13 +17,12 @@ 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" \
-		CXXFLAGS="-pipe"
+		LDFLAGS="-pthread -L${PREFIX}/lib"
 
 MAN1=		jikes.1
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_BZIP2=	yes
 
 .include <bsd.port.mk>
diff --git a/java/jikes/distinfo b/java/jikes/distinfo
index cebf1ea42d8a..fa49e0648e4d 100644
--- a/java/jikes/distinfo
+++ b/java/jikes/distinfo
@@ -1 +1 @@
-MD5 (jikes-1.16.tar.bz2) = f3ab8f0ec01b3b03b9d4de188c80a189
+MD5 (jikes-1.15.tar.gz) = 88ccc470acb5c2c8e35badd534223e2c
diff --git a/java/jikes/files/patch-ab b/java/jikes/files/patch-ab
index 5db7f8d63ad1..a14051df4473 100644
--- a/java/jikes/files/patch-ab
+++ b/java/jikes/files/patch-ab
@@ -1,12 +1,12 @@
---- configure	Tue Jul  9 23:16:00 2002
-+++ configure	Mon Aug  5 11:03:52 2002
-@@ -5366,13 +5366,13 @@
- 
+--- 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:$LINENO: checking for u_getVersion in -licu-uc" >&5
+-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:$LINENO: checking for u_getVersion in -licuuc" >&5
++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
@@ -15,11 +15,11 @@
 -LIBS="-licu-uc  $LIBS"
 +LIBS="-licuuc  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ #line 4290 "configure"
  #include "confdefs.h"
-@@ -5426,7 +5426,7 @@
+@@ -4333,7 +4333,7 @@
  #define HAVE_LIBICU_UC 1
- _ACEOF
+ EOF
  
 -  LIBS="-licu-uc $LIBS"
 +  LIBS="-licuuc $LIBS"
diff --git a/java/jikes/files/patch-ac b/java/jikes/files/patch-ac
index 9f07cac914c7..b43dedce4e7e 100644
--- a/java/jikes/files/patch-ac
+++ b/java/jikes/files/patch-ac
@@ -1,6 +1,6 @@
---- configure.in	Tue Jul  9 23:16:00 2002
-+++ configure.in	Mon Aug  5 11:03:39 2002
-@@ -113,7 +113,7 @@
+--- 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
diff --git a/java/jikes/pkg-plist b/java/jikes/pkg-plist
index 0731059fa02c..797124269ca2 100644
--- a/java/jikes/pkg-plist
+++ b/java/jikes/pkg-plist
@@ -1,4 +1,3 @@
 bin/jikes
-include/jikesapi.h
-share/doc/jikes-1.16/license.htm
-@dirrm share/doc/jikes-1.16
+share/doc/jikes-%%PORTVERSION%%/license.htm
+@dirrm share/doc/jikes-%%PORTVERSION%%