Sun Apr 28 03:31:23 2013 UTC ()
Work around linux's broken sort(1).


(dholland)
diff -r1.8 -r1.9 pkgsrc/lang/japhar/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/japhar/patches/patch-am
cvs diff -r1.8 -r1.9 pkgsrc/lang/japhar/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/japhar/distinfo 2013/02/26 11:09:09 1.8
+++ pkgsrc/lang/japhar/distinfo 2013/04/28 03:31:22 1.9
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.8 2013/02/26 11:09:09 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2013/04/28 03:31:22 dholland Exp $
2 2
3SHA1 (japhar-0.08.tar.gz) = 3f450610ca31061c1c183c8e86d1fcd47660f86d 3SHA1 (japhar-0.08.tar.gz) = 3f450610ca31061c1c183c8e86d1fcd47660f86d
4RMD160 (japhar-0.08.tar.gz) = 283f47db3a54f8f51d755a61fab94c611de13988 4RMD160 (japhar-0.08.tar.gz) = 283f47db3a54f8f51d755a61fab94c611de13988
5Size (japhar-0.08.tar.gz) = 903160 bytes 5Size (japhar-0.08.tar.gz) = 903160 bytes
6SHA1 (patch-aa) = fe445f7ce812a6a52de9a26f21eb8fd778d34e6b 6SHA1 (patch-aa) = fe445f7ce812a6a52de9a26f21eb8fd778d34e6b
7SHA1 (patch-ab) = a6c80ee5d1814002e7dd7b2a68964170af81ddc2 7SHA1 (patch-ab) = a6c80ee5d1814002e7dd7b2a68964170af81ddc2
8SHA1 (patch-ac) = 26b8f7321fad1944d5df4eba757c35f9e32fa015 8SHA1 (patch-ac) = 26b8f7321fad1944d5df4eba757c35f9e32fa015
9SHA1 (patch-ad) = 640ebdda8fe1a6d51de69dde2626c62f6b2cf1e0 9SHA1 (patch-ad) = 640ebdda8fe1a6d51de69dde2626c62f6b2cf1e0
10SHA1 (patch-ae) = 25e5f05ad68b1788247d31144410a87fc2deec1f 10SHA1 (patch-ae) = 25e5f05ad68b1788247d31144410a87fc2deec1f
11SHA1 (patch-af) = d41e8e516225e5d637882c44e44ac73e91e12941 11SHA1 (patch-af) = d41e8e516225e5d637882c44e44ac73e91e12941
12SHA1 (patch-ag) = 6be1a157dae74f79bd6848d8507fe2abf997be2e 12SHA1 (patch-ag) = 6be1a157dae74f79bd6848d8507fe2abf997be2e
13SHA1 (patch-ai) = c1ec2114b2fdaa00e4d8b5c5bcafc042b50ea077 13SHA1 (patch-ai) = c1ec2114b2fdaa00e4d8b5c5bcafc042b50ea077
14SHA1 (patch-aj) = 592306809df6b5f0dd00bf8cfe1c73478222f2dc 14SHA1 (patch-aj) = 592306809df6b5f0dd00bf8cfe1c73478222f2dc
15SHA1 (patch-ak) = 0075ab705a19ca055ee3c69d31031efa7091661d 15SHA1 (patch-ak) = 0075ab705a19ca055ee3c69d31031efa7091661d
16SHA1 (patch-al) = 8d94f91ad6ec7ff069dc74f6c6b9bc22c5c6885f 16SHA1 (patch-al) = 8d94f91ad6ec7ff069dc74f6c6b9bc22c5c6885f
17SHA1 (patch-am) = cf3055f178c7f8986e20a73677fde0c2e3a2c12f 17SHA1 (patch-am) = a1b75b9a11bac76fc4c8a46a225f10b72534bd54
18SHA1 (patch-lib_libnative_java.lang_system.c) = b53fe5ea61d130467a2cf4eff6a0e27dd458f80b 18SHA1 (patch-lib_libnative_java.lang_system.c) = b53fe5ea61d130467a2cf4eff6a0e27dd458f80b
cvs diff -r1.1 -r1.2 pkgsrc/lang/japhar/patches/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/japhar/patches/patch-am 2006/06/06 15:40:15 1.1
+++ pkgsrc/lang/japhar/patches/patch-am 2013/04/28 03:31:22 1.2
@@ -1,24 +1,33 @@ @@ -1,24 +1,33 @@
1$NetBSD: patch-am,v 1.1 2006/06/06 15:40:15 joerg Exp $ 1$NetBSD: patch-am,v 1.2 2013/04/28 03:31:22 dholland Exp $
2 2
3--- lib/libruntime/Makefile.in.orig 2006-06-06 15:22:19.000000000 +0000 3--- lib/libruntime/Makefile.in.orig 1999-03-16 03:24:42.000000000 +0000
4+++ lib/libruntime/Makefile.in 4+++ lib/libruntime/Makefile.in
5@@ -87,8 +87,7 @@ LIBS =  5@@ -87,8 +87,7 @@ LIBS =
6 @NEED_ZLIB_TRUE@ZLIB_INCLUDES = -I$(top_srcdir)/lib/zlib 6 @NEED_ZLIB_TRUE@ZLIB_INCLUDES = -I$(top_srcdir)/lib/zlib
7 @NEED_ZLIB_FALSE@ZLIB_INCLUDES =  7 @NEED_ZLIB_FALSE@ZLIB_INCLUDES =
8  8
9-@LIBFFI_SUPPORT_TRUE@FFI_INCLUDES = -I$(top_srcdir)/lib/libffi/include 9-@LIBFFI_SUPPORT_TRUE@FFI_INCLUDES = -I$(top_srcdir)/lib/libffi/include
10-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la 10-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
11+@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi 11+@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
12  12
13 @PROFILING_TRUE@OPSTACK_C = op_stack.c 13 @PROFILING_TRUE@OPSTACK_C = op_stack.c
14  14
15@@ -384,8 +383,7 @@ nativeglue.lo nativeglue.o : nativeglue. 15@@ -384,8 +383,7 @@ nativeglue.lo nativeglue.o : nativeglue.
16 ../../include/objects.h ../../include/gc.h ../../include/log.h \ 16 ../../include/objects.h ../../include/gc.h ../../include/log.h \
17 ../../include/dynamic_loading.h ../../include/exceptions.h \ 17 ../../include/dynamic_loading.h ../../include/exceptions.h \
18 ../../include/compat.h ../../include/primitive-class.h \ 18 ../../include/compat.h ../../include/primitive-class.h \
19- ../../include/util.h ../../lib/libffi/include/ffi.h \ 19- ../../include/util.h ../../lib/libffi/include/ffi.h \
20- ../../lib/libffi/include/fficonfig.h ../../include/op_stack.h 20- ../../lib/libffi/include/fficonfig.h ../../include/op_stack.h
21+ ../../include/util.h ../../include/op_stack.h 21+ ../../include/util.h ../../include/op_stack.h
22 objects.lo objects.o : objects.c ../../include/config.h \ 22 objects.lo objects.o : objects.c ../../include/config.h \
23 ../../lib/libjni/include/jniint.h \ 23 ../../lib/libjni/include/jniint.h \
24 ../../lib/libjni/include/jni.h \ 24 ../../lib/libjni/include/jni.h \
 25@@ -527,7 +525,7 @@ mostlyclean distclean maintainer-clean
 26
 27 # Make lookup table from opcode definitions
 28 interploop.h: interpfunc.c
 29- grep OPCODE interpfunc.c | grep -v '#define' | sort -n +1 > interploop.h
 30+ grep OPCODE interpfunc.c | grep -v '#define' | sort -n -k 2 > interploop.h
 31
 32 interploop.c: interploop.h
 33