head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.82 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.80 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.78 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.76 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.74 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.72 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.70 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.68 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.66 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.64 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.62 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.60 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.58 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.56 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.54 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.52 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.50 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.48 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.46 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.44 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.42 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.40 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.38 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.34 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.14 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.36 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.32 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.30 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.28 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.26 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.24 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.22 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.20 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.18 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.16 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.12 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.10 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.8 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.6 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.4 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.2 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.2.0.82 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.80 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.78 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.76 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.74 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.72 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.70 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.68 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.66 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.64 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.62 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.60 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.58 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.56 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.54 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.52 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.48 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.44 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.42 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.40 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.38 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.36 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.32 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.30 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.28 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.18 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2; locks; strict; comment @# @; 1.3 date 2015.12.29.23.34.49; author dholland; state Exp; branches; next 1.2; commitid J5mAcuIF0darSTOy; 1.2 date 2006.06.06.15.40.15; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.06.04.13.52.57; author joerg; state Exp; branches; next ; desc @@ 1.3 log @Add patch comments. @ text @$NetBSD: patch-ai,v 1.2 2006/06/06 15:40:15 joerg Exp $ Use pkgsrc libffi. Use pkgsrc readline. --- progs/japhard/Makefile.in.orig 1999-03-16 03:25:11.000000000 +0000 +++ progs/japhard/Makefile.in @@@@ -87,16 +87,16 @@@@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C @@NEED_ZLIB_TRUE@@ZLIB = $(top_builddir)/lib/zlib/libzlib.la @@NEED_ZLIB_FALSE@@ZLIB = @@ZLIB@@ -@@LIBFFI_SUPPORT_TRUE@@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la +@@LIBFFI_SUPPORT_TRUE@@LIBFFI = -lffi -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,24 @@@@ 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/zlib/libzlib.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)/arch/libarch.la japhard_LDFLAGS = CFLAGS = @@CFLAGS@@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@@@ -364,18 +358,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 \ @ 1.2 log @Axe the included libffi and use the pkgsrc version. Simpler than trying to prevent using it or fixing conflicts. Bump revision. @ text @d1 4 a4 1 $NetBSD$ @ 1.1 log @Remove ONLY_FOR_PLATFORM to give this wider exposure. Add DragonFly support. Use readline from pkgsrc. Bump revision. @ text @d3 1 a3 1 --- progs/japhard/Makefile.in.orig 2006-05-21 16:09:03.000000000 +0000 d5 3 a7 1 @@@@ -89,14 +89,14 @@@@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C d9 2 a10 1 @@LIBFFI_SUPPORT_TRUE@@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la d25 1 a25 1 @@@@ -120,30 +120,26 @@@@ japhard_OBJECTS = break.o cmd_line.o ja d37 1 a37 1 @@NEED_ZLIB_TRUE@@@@LIBFFI_SUPPORT_TRUE@@$(top_builddir)/lib/zlib/libzlib.la \ d40 1 a40 1 +@@NEED_ZLIB_TRUE@@@@LIBFFI_SUPPORT_TRUE@@$(top_builddir)/lib/libffi/src/libffi.la d53 1 a53 1 @@NEED_ZLIB_FALSE@@@@LIBFFI_SUPPORT_TRUE@@$(top_builddir)/arch/libarch.la \ d56 1 a56 1 +@@NEED_ZLIB_FALSE@@@@LIBFFI_SUPPORT_TRUE@@$(top_builddir)/lib/libffi/src/libffi.la d60 1 a60 1 @@@@ -364,18 +360,15 @@@@ cmd_line.o: cmd_line.c ../../include/con @