pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/japhar Remove ONLY_FOR_PLATFORM to give this wide...
details: https://anonhg.NetBSD.org/pkgsrc/rev/769aaf9e6362
branches: trunk
changeset: 513839:769aaf9e6362
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Jun 04 13:52:57 2006 +0000
description:
Remove ONLY_FOR_PLATFORM to give this wider exposure.
Add DragonFly support. Use readline from pkgsrc.
Bump revision.
diffstat:
lang/japhar/Makefile | 8 ++--
lang/japhar/PLIST | 8 +---
lang/japhar/distinfo | 7 +++-
lang/japhar/patches/patch-aa | 57 ++++++++++++++++++++++++++++++++
lang/japhar/patches/patch-ab | 13 +++++++
lang/japhar/patches/patch-ah | 12 ++++++
lang/japhar/patches/patch-ai | 78 ++++++++++++++++++++++++++++++++++++++++++++
lang/japhar/patches/patch-aj | 16 +++++++++
8 files changed, 187 insertions(+), 12 deletions(-)
diffs (276 lines):
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/Makefile
--- a/lang/japhar/Makefile Sun Jun 04 13:48:51 2006 +0000
+++ b/lang/japhar/Makefile Sun Jun 04 13:52:57 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/04/05 06:27:41 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/06/04 13:52:57 joerg Exp $
#
DISTNAME= japhar-0.08
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_BACKUP}
@@ -10,8 +10,6 @@
HOMEPAGE= http://www.hungry.com/old-hungry/products/japhar/
COMMENT= Java Virtual Machine, currently JDK 1.1.5-level
-ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake
@@ -23,4 +21,6 @@
# The japhar tar archive uses ././@LongLink GNU tar hacks
EXTRACT_USING= nbtar
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/PLIST
--- a/lang/japhar/PLIST Sun Jun 04 13:48:51 2006 +0000
+++ b/lang/japhar/PLIST Sun Jun 04 13:52:57 2006 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/05 06:27:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/04 13:52:57 joerg Exp $
info/japhar.info
lib/libarch.la
-lib/libffi.la
lib/libjni.la
lib/libjvmdi.la
lib/libruntime.la
@@ -16,8 +15,6 @@
lib/libjaphar_sysresource.la
lib/libjaphar_agent.la
lib/libjaphar_mmedia.la
-lib/libjaphar_awt.la
-lib/libjaphar_fontmanager.la
bin/japhar
bin/japharh
bin/japhard
@@ -70,8 +67,5 @@
include/japhar/jniint.h
include/japhar/jvmdi.h
include/japhar/jvmdiint.h
-include/fficonfig.h
-include/ffi.h
-include/ffi_mips.h
@dirrm include/japhar/private
@dirrm include/japhar
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/distinfo
--- a/lang/japhar/distinfo Sun Jun 04 13:48:51 2006 +0000
+++ b/lang/japhar/distinfo Sun Jun 04 13:52:57 2006 +0000
@@ -1,10 +1,15 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/06/04 13:52:57 joerg Exp $
SHA1 (japhar-0.08.tar.gz) = 3f450610ca31061c1c183c8e86d1fcd47660f86d
RMD160 (japhar-0.08.tar.gz) = 283f47db3a54f8f51d755a61fab94c611de13988
Size (japhar-0.08.tar.gz) = 903160 bytes
+SHA1 (patch-aa) = f7df8c888ffed761e2de857a4114482c64c811c6
+SHA1 (patch-ab) = a6c80ee5d1814002e7dd7b2a68964170af81ddc2
SHA1 (patch-ac) = 26b8f7321fad1944d5df4eba757c35f9e32fa015
SHA1 (patch-ad) = 640ebdda8fe1a6d51de69dde2626c62f6b2cf1e0
SHA1 (patch-ae) = 25e5f05ad68b1788247d31144410a87fc2deec1f
SHA1 (patch-af) = d41e8e516225e5d637882c44e44ac73e91e12941
SHA1 (patch-ag) = 4c55ba01bb3665b779a534fbe11cd22ec400b78c
+SHA1 (patch-ah) = 9802d78610b06bb2cc0a35c90c7871514b37e4aa
+SHA1 (patch-ai) = 53184296e279f637ed03c7133d93eb328b553b1a
+SHA1 (patch-aj) = 592306809df6b5f0dd00bf8cfe1c73478222f2dc
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/japhar/patches/patch-aa Sun Jun 04 13:52:57 2006 +0000
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.3 2006/06/04 13:52:57 joerg Exp $
+
+--- configure.orig 1999-03-16 02:03:46.000000000 +0000
++++ configure
+@@ -3498,6 +3498,7 @@ case "$host" in
+ mips-sgi-irix5.* | mips-sgi-irix6.*) can_use_libffi=true;;
+ i*86-pc-linux*) can_use_libffi=true;;
+ i*86-*-freebsd*) can_use_libffi=true;;
++ *-*-dragonfly*) can_use_libffi=true;;
+ i*86-pc-solaris2*) can_use_libffi=true;;
+ sparc-sun-4*) can_use_libffi=true;;
+ sparc-sun-*) can_use_libffi=true;;
+@@ -4043,14 +4044,14 @@ done
+ fi
+
+ if test "x${threads}" = xno; then
+- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:4048: checking for pthread_create in -lpthread" >&5
++ echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
++echo "configure:4048: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4056 "configure"
+ #include "confdefs.h"
+@@ -4084,7 +4085,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ #define $ac_tr_lib 1
+ EOF
+
+- LIBS="-lpthread $LIBS"
++ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+
+ else
+ echo "$ac_t""no" 1>&6
+@@ -6178,7 +6179,7 @@ EOF
+
+ fi
+
+-subdirs="lib/libffi progs/japhard/readline"
++subdirs="lib/libffi"
+
+
+ trap '' 1 2 15
+@@ -6707,7 +6712,7 @@ if test "$no_recursion" != yes; then
+ esac
+ done
+
+- for ac_config_dir in lib/libffi progs/japhard/readline; do
++ for ac_config_dir in lib/libffi; do
+
+ # Do not complain, so a configure script can configure whichever
+ # parts of a large source tree are present.
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/japhar/patches/patch-ab Sun Jun 04 13:52:57 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/06/04 13:52:57 joerg Exp $
+
+--- include/dynamic_loading.h.orig 2006-05-21 16:00:36.000000000 +0000
++++ include/dynamic_loading.h
+@@ -29,7 +29,7 @@ extern "C" {
+ #endif
+
+ #if defined USE_DLL && ( defined HAVE_DLFCN_H || defined HAVE_DL_H )
+-# if (__FreeBSD__ < 3 && !defined( PROFILING )) || !defined(__FreeBSD__)
++# if (defined(__FreeBSD__) && __FreeBSD__ < 3 && !defined( PROFILING )) || !defined(__FreeBSD__)
+ # define HAVE_DLL
+ # endif
+ #endif
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/japhar/patches/patch-ah Sun Jun 04 13:52:57 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2006/06/04 13:52:57 joerg Exp $
+
+--- lib/libffi/configure.orig 2006-05-21 16:01:22.000000000 +0000
++++ lib/libffi/configure
+@@ -1763,6 +1763,7 @@ case "$host" in
+ mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; TARGETDIR=mips;;
+ i*86-pc-linux*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-freebsd*) TARGET=X86; TARGETDIR=x86;;
++i*86-*-dragonfly*) TARGET=X86; TARGETDIR=x86;;
+ sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
+ sparc-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
+ alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; TARGETDIR=alpha;;
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/japhar/patches/patch-ai Sun Jun 04 13:52:57 2006 +0000
@@ -0,0 +1,78 @@
+$NetBSD: patch-ai,v 1.1 2006/06/04 13:52:57 joerg Exp $
+
+--- progs/japhard/Makefile.in.orig 2006-05-21 16:09:03.000000000 +0000
++++ progs/japhard/Makefile.in
+@@ -89,14 +89,14 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
+
+ @LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
+
+-SUBDIRS = readline
++SUBDIRS =
+
+ bin_PROGRAMS = japhard
+
+ japhard_SOURCES = break.c cmd_line.c japhard.c stack.c break.h cmds.h
stack.h
+
+
+-japhard_LDADD = $(top_builddir)/lib/libjni/src/libjni.la $(top_builddir)/lib/libruntime/libruntime.la $(top_builddir)/lib/libjvmdi/src/libjvmdi.la $(top_builddir)/arch/libarch.la
-L/usr/local/lib @X_PRE_LIBS@ @X_LIBS@ $(ZLIB) $(LIBFFI) $(top_builddir)/progs/japhard/readline/libreadline.a -ltermcap
++japhard_LDADD = $(top_builddir)/lib/libjni/src/libjni.la $(top_builddir)/lib/libruntime/libruntime.la $(top_builddir)/lib/libjvmdi/src/libjvmdi.la $(top_builddir)/arch/libarch.la
-L/usr/local/lib @X_PRE_LIBS@ @X_LIBS@ $(ZLIB) $(LIBFFI) -lreadline -ltermcap
+
+
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libjvmdi/include -I$(top_srcdir)/lib/libjni/include -I$(top_builddir)/lib/libjni/include @OS_DEFINE@
-DVERSION="@VERSION@"
+@@ -120,30 +120,26 @@ japhard_OBJECTS = break.o cmd_line.o ja
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/progs/japhard/readline/libreadline.a
++@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@japhard_DEPENDENCIES = \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
++@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@japhard_DEPENDENCIES = \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/progs/japhard/readline/libreadline.a
++@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/zlib/libzlib.la
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@japhard_DEPENDENCIES = \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
++@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
+ japhard_LDFLAGS =
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -364,18 +360,15 @@ cmd_line.o: cmd_line.c ../../include/con
+ ../../lib/libjni/include/jni.h \
+ ../../lib/libjni/include/jnitypes.h ../../include/ClazzFile.h \
+ ../../include/native-threads.h ../../include/sig.h stack.h \
+- break.h ../../lib/libjvmdi/include/jvmdi.h cmds.h \
+- readline/readline.h readline/keymaps.h readline/chardefs.h \
+- readline/tilde.h
++ break.h ../../lib/libjvmdi/include/jvmdi.h cmds.h
+ japhard.o: japhard.c ../../include/config.h \
+ ../../lib/libjvmdi/include/jvmdi.h \
+ ../../lib/libjni/include/jni.h \
+ ../../lib/libjni/include/jnitypes.h ../../include/gc.h \
+- ../../include/log.h cmds.h readline/readline.h \
+- readline/keymaps.h readline/chardefs.h readline/tilde.h break.h \
++ ../../include/log.h cmds.h break.h \
+ ../../include/ClazzFile.h ../../include/native-threads.h \
+ ../../include/sig.h ../../include/classpath.h \
+- ../../include/zipfile.h stack.h readline/history.h
++ ../../include/zipfile.h stack.h
+ stack.o: stack.c ../../lib/libjni/include/jniint.h \
+ ../../lib/libjni/include/jni.h \
+ ../../lib/libjni/include/jnitypes.h ../../include/classpath.h \
diff -r 8adcdd605e7f -r 769aaf9e6362 lang/japhar/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/japhar/patches/patch-aj Sun Jun 04 13:52:57 2006 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2006/06/04 13:52:57 joerg Exp $
+
+--- lib/libruntime/interpfunc.c.orig 2006-05-21 16:34:25.000000000 +0000
++++ lib/libruntime/interpfunc.c
+@@ -1842,7 +1842,11 @@ OPCODE(fcmpg, 150, 0, 2, 1)
+ op_stack_pop_float(ENV(f), OPSTACK(f), &value2);
+ op_stack_pop_float(ENV(f), OPSTACK(f), &value1);
+
++#ifdef isnan /* assume C99 style macro */
++ if (isnan(value1) || isnan(value2))
++#else
+ if (isnanf(value1) || isnanf(value2))
++#endif
+ op_stack_push_int(ENV(f), OPSTACK(f), 1);
+ else if (value1 > value2)
+ op_stack_push_int(ENV(f), OPSTACK(f), 1);
Home |
Main Index |
Thread Index |
Old Index