[pkgsrc/trunk]: pkgsrc/lang Use the installed version of libkaffevm and be a ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/103a53f6abbd
branches:  trunk
changeset: 513488:103a53f6abbd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon May 29 17:47:10 2006 +0000

description:
Use the installed version of libkaffevm and be a bit less aggressive
in kaffe-x11 when not building parts of the tree. Fixes build issues
on DragonFly, but doesn't affect the binary package.

diffstat:

 lang/kaffe-x11/Makefile     |  16 ++++++++--------
 lang/kaffe/distinfo         |   3 ++-
 lang/kaffe/patches/patch-ad |  22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 8080788bec24 -r 103a53f6abbd lang/kaffe-x11/Makefile
--- a/lang/kaffe-x11/Makefile   Mon May 29 17:21:33 2006 +0000
+++ b/lang/kaffe-x11/Makefile   Mon May 29 17:47:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/10 16:46:21 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/29 17:47:10 joerg Exp $
 #
 
 .include "../../lang/kaffe/Makefile.common"
@@ -14,13 +14,13 @@
 CONFIGURE_ARGS+=  --disable-esdtest
 
 
-BUILD_DIRS=     config
-BUILD_DIRS+=    libraries/javalib
-BUILD_DIRS+=    libraries/clib/classpath
-BUILD_DIRS+=    libraries/clib/awt
-BUILD_DIRS+=   libraries/javalib/external/classpath/native/jni/gtk-peer
-BUILD_DIRS+=   libraries/javalib/external/classpath/native/jawt
-INSTALL_DIRS=   libraries/clib/awt
+BUILD_DIRS=    config
+BUILD_DIRS+=   libraries/javalib/external/classpath
+BUILD_DIRS+=   libraries/javalib/external/classpath
+BUILD_DIRS+=   include
+BUILD_DIRS+=   libraries/javalib
+BUILD_DIRS+=   libraries/clib/awt
+INSTALL_DIRS=  libraries/clib/awt
 INSTALL_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer
 INSTALL_DIRS+= libraries/javalib/external/classpath/native/jawt
 
diff -r 8080788bec24 -r 103a53f6abbd lang/kaffe/distinfo
--- a/lang/kaffe/distinfo       Mon May 29 17:21:33 2006 +0000
+++ b/lang/kaffe/distinfo       Mon May 29 17:47:10 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2006/05/16 19:11:33 joerg Exp $
+$NetBSD: distinfo,v 1.23 2006/05/29 17:47:10 joerg Exp $
 
 SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = a06b60e1ba76df59955bd1aba305fc8fef0a310a
 SHA1 (patch-ab) = 51382ff9c9672eab7bb1729e8435af3d134a4ea1
 SHA1 (patch-ac) = 2fb9d3d7bdfdecd6090403aae9485662d1bcfbc5
+SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f
diff -r 8080788bec24 -r 103a53f6abbd lang/kaffe/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ad       Mon May 29 17:47:10 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.10 2006/05/29 17:47:10 joerg Exp $
+
+--- libraries/clib/awt/X/Makefile.in.orig      2006-05-29 15:57:43.000000000 +0000
++++ libraries/clib/awt/X/Makefile.in
+@@ -84,7 +84,7 @@ am__installdirs = "$(DESTDIR)$(nativedir
+ nativeLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(native_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libxawt_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
++libxawt_la_DEPENDENCIES = \
+       $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \
+       $(am__DEPENDENCIES_1)
+ am_libxawt_la_OBJECTS = libxawt_la-tlk.lo libxawt_la-wnd.lo \
+@@ -399,7 +399,7 @@ libxawt_la_LDFLAGS = \
+       -export-symbols-regex "^([Jj]ava|kaffe)_"
+ 
+ libxawt_la_LIBADD = \
+-      $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
++      ${nativedir}/libkaffevm.la \
+       $(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \
+       $(AWT_LIBS)
+