From e4717d5807ae2884c9a36c17cab9e5c1a0c6736d Mon Sep 17 00:00:00 2001 From: Archie Cobbs Date: Tue, 27 Aug 2002 20:32:03 +0000 Subject: Split the jikes port into stable and development versions. PR: ports/41961 Reviewed by: freebsd-java --- java/Makefile | 1 + java/jikes-devel/Makefile | 29 +++++++++++++++++++++++++++++ java/jikes-devel/distinfo | 1 + java/jikes-devel/files/patch-aa | 11 +++++++++++ java/jikes-devel/files/patch-ab | 28 ++++++++++++++++++++++++++++ java/jikes-devel/files/patch-ac | 11 +++++++++++ java/jikes-devel/pkg-comment | 1 + java/jikes-devel/pkg-descr | 18 ++++++++++++++++++ java/jikes-devel/pkg-message | 10 ++++++++++ java/jikes-devel/pkg-plist | 4 ++++ java/jikes/Makefile | 9 ++++----- java/jikes/distinfo | 2 +- java/jikes/files/patch-ab | 18 +++++++++--------- java/jikes/files/patch-ac | 6 +++--- java/jikes/pkg-plist | 5 ++--- 15 files changed, 133 insertions(+), 21 deletions(-) create mode 100644 java/jikes-devel/Makefile create mode 100644 java/jikes-devel/distinfo create mode 100644 java/jikes-devel/files/patch-aa create mode 100644 java/jikes-devel/files/patch-ab create mode 100644 java/jikes-devel/files/patch-ac create mode 100644 java/jikes-devel/pkg-comment create mode 100644 java/jikes-devel/pkg-descr create mode 100644 java/jikes-devel/pkg-message create mode 100644 java/jikes-devel/pkg-plist diff --git a/java/Makefile b/java/Makefile index f12b09371d95..e35e57b0c1eb 100644 --- a/java/Makefile +++ b/java/Makefile @@ -40,6 +40,7 @@ SUBDIR += jdom SUBDIR += jfc SUBDIR += jikes + SUBDIR += jikes-devel SUBDIR += jlex SUBDIR += jlint SUBDIR += jre diff --git a/java/jikes-devel/Makefile b/java/jikes-devel/Makefile new file mode 100644 index 000000000000..075438db6d12 --- /dev/null +++ b/java/jikes-devel/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: jikes +# Date created: 09 December 1998 +# Whom: Matthew Dillon +# +# $FreeBSD$ +# + +PORTNAME= jikes +PORTVERSION= 1.16 +PORTREVISION= 3 +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} +GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_BZIP2= yes + +.include diff --git a/java/jikes-devel/distinfo b/java/jikes-devel/distinfo new file mode 100644 index 000000000000..cebf1ea42d8a --- /dev/null +++ b/java/jikes-devel/distinfo @@ -0,0 +1 @@ +MD5 (jikes-1.16.tar.bz2) = f3ab8f0ec01b3b03b9d4de188c80a189 diff --git a/java/jikes-devel/files/patch-aa b/java/jikes-devel/files/patch-aa new file mode 100644 index 000000000000..620d436c157a --- /dev/null +++ b/java/jikes-devel/files/patch-aa @@ -0,0 +1,11 @@ +--- doc/Makefile.in Tue Jul 9 23:16:00 2002 ++++ doc/Makefile.in Mon Aug 5 11:02:39 2002 +@@ -80,7 +80,7 @@ + install_sh = @install_sh@ + man_MANS = jikes.1 + +-docdir = $(prefix)/doc/${PACKAGE}-${VERSION} ++docdir = $(prefix)/share/doc/${PACKAGE}-${VERSION} + + doc_DATA = \ + license.htm diff --git a/java/jikes-devel/files/patch-ab b/java/jikes-devel/files/patch-ab new file mode 100644 index 000000000000..5db7f8d63ad1 --- /dev/null +++ b/java/jikes-devel/files/patch-ab @@ -0,0 +1,28 @@ +--- configure Tue Jul 9 23:16:00 2002 ++++ configure Mon Aug 5 11:03:52 2002 +@@ -5366,13 +5366,13 @@ + + + +-echo "$as_me:$LINENO: 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 $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 $LINENO "configure" + #include "confdefs.h" +@@ -5426,7 +5426,7 @@ + #define HAVE_LIBICU_UC 1 + _ACEOF + +- LIBS="-licu-uc $LIBS" ++ LIBS="-licuuc $LIBS" + + fi + diff --git a/java/jikes-devel/files/patch-ac b/java/jikes-devel/files/patch-ac new file mode 100644 index 000000000000..9f07cac914c7 --- /dev/null +++ b/java/jikes-devel/files/patch-ac @@ -0,0 +1,11 @@ +--- configure.in Tue Jul 9 23:16:00 2002 ++++ configure.in Mon Aug 5 11:03:39 2002 +@@ -113,7 +113,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) diff --git a/java/jikes-devel/pkg-comment b/java/jikes-devel/pkg-comment new file mode 100644 index 000000000000..51e64086b1b3 --- /dev/null +++ b/java/jikes-devel/pkg-comment @@ -0,0 +1 @@ +A very fast Java source to byte-code compiler made available by IBM diff --git a/java/jikes-devel/pkg-descr b/java/jikes-devel/pkg-descr new file mode 100644 index 000000000000..90d8441ffffe --- /dev/null +++ b/java/jikes-devel/pkg-descr @@ -0,0 +1,18 @@ +This is jikes, a java source to byte-code compiler. The compiler has been +made available by IBM under their open-source license, please see: + +WWW: http://oss.software.ibm.com/developerworks/opensource/jikes/project/ + +for details. To operate, the CLASSPATH environment variable must typically +be set to a colon-delimited list of source directories, class directories, +or zip files. Note that jikes will complain if a non-existant directory or +file is specified in CLASSPATH. + +=============== + +// This software is subject to the terms of the IBM Jikes Compiler Open" +// Source License Agreement available at the following URL:" +// http://www.ibm.com/research/jikes." +// Copyright (C) 1996, 1998, International Business Machines Corporation" +// and others. All Rights Reserved." +// You must accept the terms of that agreement to use this software." diff --git a/java/jikes-devel/pkg-message b/java/jikes-devel/pkg-message new file mode 100644 index 000000000000..3563ce1f0109 --- /dev/null +++ b/java/jikes-devel/pkg-message @@ -0,0 +1,10 @@ +This distribution is covered by the "IBM Public License Version +Version 1.0 - Jikes" contained in the file doc/license.htm. You +must accept the terms of the license agreement to use this software. + +http://ibm.com/developerworks/opensource/jikes + +Copyright (C) 1996, 1998, International Business Machines Corporation +and others. All Rights Reserved. + +You must accept the terms of that agreement to use this software. diff --git a/java/jikes-devel/pkg-plist b/java/jikes-devel/pkg-plist new file mode 100644 index 000000000000..f8deca524ad8 --- /dev/null +++ b/java/jikes-devel/pkg-plist @@ -0,0 +1,4 @@ +bin/jikes +include/jikesapi.h +share/doc/jikes-%%PORTVERSION%%/license.htm +@dirrm share/doc/jikes-%%PORTVERSION%% 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 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%% -- cgit v1.2.3