summaryrefslogtreecommitdiff
path: root/lang/kaffe-x11
diff options
context:
space:
mode:
Diffstat (limited to 'lang/kaffe-x11')
-rw-r--r--lang/kaffe-x11/Makefile30
-rw-r--r--lang/kaffe-x11/PLIST8
2 files changed, 22 insertions, 16 deletions
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index 6cba95c8d31..be4da91f1a0 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,23 +1,31 @@
-# $NetBSD: Makefile,v 1.9 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/05/10 16:46:21 tonio Exp $
#
.include "../../lang/kaffe/Makefile.common"
PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION= 3
COMMENT+= (AWT support through X11)
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-native-awt/--with-kaffe-x-awt/}
+CONFIGURE_ARGS+= --with-kaffe-x-awt
+CONFIGURE_ARGS+= --enable-gtk-peer
+CONFIGURE_ARGS+= --with-x
+CONFIGURE_ARGS+= --without-esd
+CONFIGURE_ARGS+= --disable-esdtest
-BUILD_DIRS= ${WRKSRC}/config
-BUILD_DIRS+= ${WRKSRC}/libraries/javalib
-BUILD_DIRS+= ${WRKSRC}/include
-BUILD_DIRS+= ${WRKSRC}/replace
-BUILD_DIRS+= ${WRKSRC}/kaffe/kaffevm
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/classpath
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/awt
-INSTALL_DIRS= ${WRKSRC}/libraries/clib/awt
+
+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
+INSTALL_DIRS+= libraries/javalib/external/classpath/native/jni/gtk-peer
+INSTALL_DIRS+= libraries/javalib/external/classpath/native/jawt
+
+pre-build:
+ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} BUILD_ENVIRONMENT
PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
diff --git a/lang/kaffe-x11/PLIST b/lang/kaffe-x11/PLIST
index 0711b4fd827..ba7962aca7e 100644
--- a/lang/kaffe-x11/PLIST
+++ b/lang/kaffe-x11/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/06 18:18:01 tonio Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/10 16:46:21 tonio Exp $
java/kaffe/jre/lib/${MACHINE_ARCH}/libgtkpeer.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libjawt.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjawtgnu.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libxawt.la
-java/kaffe/lib/awt/font.properties
-@dirrm java/kaffe/lib/awt
-@comment in kaffe: @dirrm java/kaffe/lib
@comment in kaffe: @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
+@comment in kaffe: @dirrm java/kaffe/jre/lib