Subject: Re: pkg/30017 kaffe-x11 for kaffe-1.1.5 (with patch)
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Antoine Reilles <Antoine.Reilles@loria.fr>
List: pkgsrc-bugs
Date: 04/24/2005 20:53:01
The following reply was made to PR pkg/30017; it has been noted by GNATS.
From: Antoine Reilles <Antoine.Reilles@loria.fr>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/30017 kaffe-x11 for kaffe-1.1.5 (with patch)
Date: Sun, 24 Apr 2005 22:50:04 +0200
Here a patch that worked for me under -current, for kaffe-x11 version 1.1.5.
Kaffe x11 now uses gtk2, so i added the necessary buildlinks, ans also added in
BUILD_DIRS the necessary dirs to build version 1.1.5
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe-x11/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 17 Oct 2004 15:32:57 -0000 1.3
+++ Makefile 24 Apr 2005 20:48:39 -0000
@@ -3,21 +3,30 @@
.include "../../lang/kaffe/Makefile.common"
-PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION= 1
+PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
+PKGREVISION= 1
-COMMENT+= (AWT support through X11)
+COMMENT+= (AWT support through X11)
-USE_X11= YES
+USE_X11= YES
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-awt/--with-awt=X/}
-
-BUILD_DIRS= ${WRKSRC}/config
-BUILD_DIRS+= ${WRKSRC}/libraries/clib/awt
-INSTALL_DIRS= ${WRKSRC}/libraries/clib/awt
-
-PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-native-awt/--with-kaffe-x-awt/}
+BUILD_DIRS= ${WRKSRC}/config
+BUILD_DIRS+= ${WRKSRC}/libraries/javalib
+BUILD_DIRS+= ${WRKSRC}/include
+BUILD_DIRS+= ${WRKSRC}/libltdl
+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
+
+PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe-x11/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST 22 Sep 2004 08:09:39 -0000 1.2
+++ PLIST 24 Apr 2005 20:48:39 -0000
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:39 jlam Exp $
-java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.la
+@comment $NetBSD$
+java/kaffe/jre/lib/${MACHINE_ARCH}/libgtkpeer.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libjawt.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libxawt.la
+java/kaffe/lib/awt/font.properties
+@comment in kaffe: @dirrm java/kaffe/lib/awt
+@comment in kaffe: @dirrm java/kaffe/lib
@comment in kaffe: @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}