Attachment #53303 for bug #80641

View | Details | Raw Unified | Return to bug 80641
Collapse All | Expand All




#

PORTNAME=	kaffe
PORTVERSION=	1.1.5
PORTREVISION=	1
CATEGORIES=	java
MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/



WRKSRC=		${WRKDIR}/kaffe-${PORTVERSION}

ONLY_FOR_ARCHS=	i386 amd64

USE_LIBTOOL_VER=15
USE_GMAKE=	yes
USE_ICONV=	yes
LIBTOOLFLAGS=

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}

USE_GNOME=	esound gtk20 libartlgpl2
WANT_GNOME=	esound

MAN1=		kaffe.1

OPTIONS=	AWT_X "Use AWT widgets with X" On \
		AWT_QT "Use AWT widgets with Qt" Off

.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=x86_64
    BROKEN=	"Choose either 'X' or 'Qt' in 'make config'"
. endif
  CONFIGURE_ARGS+=	--with-awt=X
  USE_XLIB=		yes
  AWT=			yes
  WITH_ESOUND=		yes
.elif defined(WITH_AWT_QT)
  CONFIGURE_ARGS+=	--with-awt=qt --with-qtdir=${X11BASE}
  AWT=			yes
  USE_QT_VER=		3
  WITH_ESOUND=		yes
.else
  CONFIGURE_ARGS+=	--with-awt=no
.endif

.if defined(AWT)
  PLIST_SUB+=	SUB_AWT=""
.else
PLIST_SUB+=    PORTVER=${PORTVERSION} ARCH=${ARCH}
.endif

.if defined(WITH_ESOUND)
  USE_GNOME+=	esound
  PLIST_SUB+=	SUB_ESOUND=""
.else
  PLIST_SUB+=	SUB_ESOUND="@comment "
.endif

PLIST_SUB+=	PORTVER=${PORTVERSION} ARCH=${ARCH}

post-install:
	@${MKDIR} ${DATADIR}
	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	MD5 (kaffe-1.1.3.tar.gz) = 2563e002e554b1c1644cb84cc3eaba74	1	MD5 (kaffe-1.1.5.tar.gz) = 928c578d4808012fe5ba5587071d2aa2
2	SIZE (kaffe-1.1.3.tar.gz) = 8937585	2	SIZE (kaffe-1.1.5.tar.gz) = 9796278




bin/javac
bin/javadoc
bin/javah
bin/javakey
bin/javap
bin/jdb
bin/kaffe
bin/kaffeh
bin/kjc
bin/kopi
bin/native2ascii
bin/rmic
bin/rmiregistry
bin/serialver
include/jawt.h
include/jawt_md.h
include/jni.h
include/jni_cpp.h
include/jvmpi.h
include/kaffe/java_lang_Object.h
include/kaffe/java_lang_StackTraceElement.h
include/kaffe/java_lang_String.h

include/kaffe/java_lang_Throwable.h
include/kaffe/java_lang_VMThrowable.h
include/kaffe/jmalloc.h
include/kaffe/jni_md.h
include/kaffe_jni.h
include/jni_cpp.h
include/jvmpi.h
jre/bin/java
jre/bin/kaffe
jre/bin/kaffe-bin
jre/bin/rmiregistry
jre/lib/gmpjavamath.jar
jre/lib/%%ARCH%%/libclasspath-%%PORTVER%%.so
jre/lib/%%ARCH%%/libclasspath.a
jre/lib/%%ARCH%%/libclasspath.so
jre/lib/%%ARCH%%/libgtkpeer.a
jre/lib/%%ARCH%%/libgtkpeer.so
jre/lib/%%ARCH%%/libgtkpeer.so.0
jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
jre/lib/%%ARCH%%/libio.a
jre/lib/%%ARCH%%/libio.la
jre/lib/%%ARCH%%/libio.so
jre/lib/%%ARCH%%/libjawt.a
jre/lib/%%ARCH%%/libjawt.so
jre/lib/%%ARCH%%/libjawt.so.0
jre/lib/%%ARCH%%/libkaffegc-%%PORTVER%%.so
jre/lib/%%ARCH%%/libkaffegc.a
jre/lib/%%ARCH%%/libkaffegc.so
jre/lib/%%ARCH%%/libkaffeverifier-%%PORTVER%%.so
jre/lib/%%ARCH%%/libkaffeverifier.a
jre/lib/%%ARCH%%/libkaffeverifier.so
jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
jre/lib/%%ARCH%%/libkaffevm.a
jre/lib/%%ARCH%%/libkaffevm.la
jre/lib/%%ARCH%%/libkaffevm.so
jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
jre/lib/%%ARCH%%/libmanagement.a
jre/lib/%%ARCH%%/libmanagement.la
jre/lib/%%ARCH%%/libmanagement.so
jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
jre/lib/%%ARCH%%/libmath.a
jre/lib/%%ARCH%%/libmath.la
jre/lib/%%ARCH%%/libmath.so
jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
jre/lib/%%ARCH%%/libnative.a
jre/lib/%%ARCH%%/libnative.la
jre/lib/%%ARCH%%/libnative.so
jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
jre/lib/%%ARCH%%/libnet.a
jre/lib/%%ARCH%%/libnet.la
jre/lib/%%ARCH%%/libnet.so
jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
jre/lib/%%ARCH%%/libnio.a
jre/lib/%%ARCH%%/libnio.la
jre/lib/%%ARCH%%/libnio.so
jre/lib/%%ARCH%%/libreplace-%%PORTVER%%.so
jre/lib/%%ARCH%%/libreplace.a
jre/lib/%%ARCH%%/libreplace.so
jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
jre/lib/%%ARCH%%/libsecurity.a
jre/lib/%%ARCH%%/libsecurity.la
jre/lib/%%ARCH%%/libsecurity.so
jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
jre/lib/%%ARCH%%/libtritonusesd.so
jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
jre/lib/%%ARCH%%/libzip.a
jre/lib/%%ARCH%%/libzip.la
jre/lib/%%ARCH%%/libzip.so
jre/lib/logging.properties
%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.a
%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.la
%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.so
jre/lib/security/java.security
jre/lib/rt.jar
jre/lib/security/java.security
jre/lib/tools.jar
lib/awt/font.properties
%%DATADIR%%/BUILD_ENVIRONMENT
%%DATADIR%%/license.terms
share/locale/fr/LC_MESSAGES/kaffe.mo
share/locale/zh_TW/LC_MESSAGES/kaffe.mo
@dirrm include/kaffe
@dirrm jre/bin
@dirrm jre/lib/%%ARCH%%




--- libraries/clib/net/InetAddressImpl.c.orig	Wed Dec 31 13:43:03 2003
+++ libraries/clib/net/InetAddressImpl.c	Wed Dec 31 13:43:09 2003
@@ -241,7 +241,9 @@
 			   "Unable to contact name server");
       break;
     case EAI_NONAME:
+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
     case EAI_NODATA:
+#endif
       postExceptionMessage(&einfo,
 			   JAVA_NET(UnknownHostException),
 			   "Unknown host: %s",





$FreeBSD: ports/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c,v 1.1 2005/01/10 11:04:50 edwin Exp $

--- kaffe/kaffevm/jit3/labels.c.orig
+++ kaffe/kaffevm/jit3/labels.c
@@ -217,6 +217,7 @@
 #endif
 			ABORT();
 #endif
+			break;
 		}
 #if 0
 		/*

Return to bug 80641

Lines 6-13 Link Here

(-)Makefile (-36 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= kaffe	8	PORTNAME= kaffe
9	PORTVERSION= 1.1.3	9	PORTVERSION= 1.1.5
10	PORTREVISION= 1
11	CATEGORIES= java	10	CATEGORIES= java
12	MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/	11	MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
13		12
Lines 23-31 Link Here
23		22
24	WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION}	23	WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION}
25		24
26	ONLY_FOR_ARCHS= i386	25	ONLY_FOR_ARCHS= i386 amd64
27		26
28	USE_LIBTOOL_VER=13	27	USE_LIBTOOL_VER=15
29	USE_GMAKE= yes	28	USE_GMAKE= yes
30	USE_ICONV= yes	29	USE_ICONV= yes
31	LIBTOOLFLAGS=	30	LIBTOOLFLAGS=
Lines 33-79 Link Here
33	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
34	CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}	33	CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE}
35		34
		35	USE_GNOME= esound gtk20 libartlgpl2
36	WANT_GNOME= esound	36	WANT_GNOME= esound
37		37
38	MAN1= kaffe.1	38	MAN1= kaffe.1
39		39
40	OPTIONS= AWT_X "Use AWT widgets with X" On \
41	AWT_QT "Use AWT widgets with Qt" Off
42
43	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
44		41
45	.if defined(WITH_AWT_X)	42	.if ${ARCH} == amd64
46	. if defined(WITH_AWT_QT)	43	PLIST_SUB+= PORTVER=${PORTVERSION} ARCH=x86_64
47	BROKEN= "Choose either 'X' or 'Qt' in 'make config'"
48	. endif
49	CONFIGURE_ARGS+= --with-awt=X
50	USE_XLIB= yes
51	AWT= yes
52	WITH_ESOUND= yes
53	.elif defined(WITH_AWT_QT)
54	CONFIGURE_ARGS+= --with-awt=qt --with-qtdir=${X11BASE}
55	AWT= yes
56	USE_QT_VER= 3
57	WITH_ESOUND= yes
58	.else
59	CONFIGURE_ARGS+= --with-awt=no
60	.endif
61
62	.if defined(AWT)
63	PLIST_SUB+= SUB_AWT=""
64	.else	44	.else
65	PLIST_SUB+= SUB_AWT="@comment "	45	PLIST_SUB+= PORTVER=${PORTVERSION} ARCH=${ARCH}
66	.endif	46	.endif
67		47
68	.if defined(WITH_ESOUND)
69	USE_GNOME+= esound
70	PLIST_SUB+= SUB_ESOUND=""
71	.else
72	PLIST_SUB+= SUB_ESOUND="@comment "
73	.endif
74
75	PLIST_SUB+= PORTVER=${PORTVERSION} ARCH=${ARCH}
76
77	post-install:	48	post-install:
78	@${MKDIR} ${DATADIR}	49	@${MKDIR} ${DATADIR}
79	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR}	50	${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR}

Lines 5-21 Link Here

(-)pkg-plist (-35 / +34 lines)
5	bin/javac	5	bin/javac
6	bin/javadoc	6	bin/javadoc
7	bin/javah	7	bin/javah
8	bin/javakey
9	bin/javap	8	bin/javap
10	bin/jdb
11	bin/kaffe	9	bin/kaffe
12	bin/kaffeh	10	bin/kaffeh
13	bin/kjc
14	bin/kopi
15	bin/native2ascii	11	bin/native2ascii
16	bin/rmic	12	bin/rmic
17	bin/rmiregistry	13	bin/rmiregistry
18	bin/serialver	14	bin/serialver
		15	include/jawt.h
		16	include/jawt_md.h
		17	include/jni.h
		18	include/jni_cpp.h
		19	include/jvmpi.h
19	include/kaffe/java_lang_Object.h	20	include/kaffe/java_lang_Object.h
20	include/kaffe/java_lang_StackTraceElement.h	21	include/kaffe/java_lang_StackTraceElement.h
21	include/kaffe/java_lang_String.h	22	include/kaffe/java_lang_String.h
Lines 24-86 Link Here
24	include/kaffe/java_lang_Throwable.h	25	include/kaffe/java_lang_Throwable.h
25	include/kaffe/java_lang_VMThrowable.h	26	include/kaffe/java_lang_VMThrowable.h
26	include/kaffe/jmalloc.h	27	include/kaffe/jmalloc.h
27	include/kaffe/jtypes.h	28	include/kaffe/jni_md.h
28	include/jni.h	29	include/kaffe_jni.h
29	include/jni_cpp.h
30	include/jvmpi.h
31	jre/bin/java	30	jre/bin/java
32	jre/bin/kaffe	31	jre/bin/kaffe
33	jre/bin/kaffe-bin	32	jre/bin/kaffe-bin
34	jre/bin/rmiregistry	33	jre/bin/rmiregistry
35	%%SUB_AWT%%jre/lib/%%ARCH%%/libawt-%%PORTVER%%.so	34	jre/lib/gmpjavamath.jar
36	%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.a	35	jre/lib/%%ARCH%%/libclasspath-%%PORTVER%%.so
37	%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.la	36	jre/lib/%%ARCH%%/libclasspath.a
38	%%SUB_AWT%%jre/lib/%%ARCH%%/libawt.so	37	jre/lib/%%ARCH%%/libclasspath.so
		38	jre/lib/%%ARCH%%/libgtkpeer.a
		39	jre/lib/%%ARCH%%/libgtkpeer.so
		40	jre/lib/%%ARCH%%/libgtkpeer.so.0
39	jre/lib/%%ARCH%%/libio-%%PORTVER%%.so	41	jre/lib/%%ARCH%%/libio-%%PORTVER%%.so
40	jre/lib/%%ARCH%%/libio.a
41	jre/lib/%%ARCH%%/libio.la
42	jre/lib/%%ARCH%%/libio.so	42	jre/lib/%%ARCH%%/libio.so
		43	jre/lib/%%ARCH%%/libjawt.a
		44	jre/lib/%%ARCH%%/libjawt.so
		45	jre/lib/%%ARCH%%/libjawt.so.0
		46	jre/lib/%%ARCH%%/libkaffegc-%%PORTVER%%.so
		47	jre/lib/%%ARCH%%/libkaffegc.a
		48	jre/lib/%%ARCH%%/libkaffegc.so
		49	jre/lib/%%ARCH%%/libkaffeverifier-%%PORTVER%%.so
		50	jre/lib/%%ARCH%%/libkaffeverifier.a
		51	jre/lib/%%ARCH%%/libkaffeverifier.so
43	jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so	52	jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
44	jre/lib/%%ARCH%%/libkaffevm.a	53	jre/lib/%%ARCH%%/libkaffevm.a
45	jre/lib/%%ARCH%%/libkaffevm.la
46	jre/lib/%%ARCH%%/libkaffevm.so	54	jre/lib/%%ARCH%%/libkaffevm.so
47	jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so	55	jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
48	jre/lib/%%ARCH%%/libmanagement.a
49	jre/lib/%%ARCH%%/libmanagement.la
50	jre/lib/%%ARCH%%/libmanagement.so	56	jre/lib/%%ARCH%%/libmanagement.so
51	jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so	57	jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
52	jre/lib/%%ARCH%%/libmath.a
53	jre/lib/%%ARCH%%/libmath.la
54	jre/lib/%%ARCH%%/libmath.so	58	jre/lib/%%ARCH%%/libmath.so
55	jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so	59	jre/lib/%%ARCH%%/libnative-%%PORTVER%%.so
56	jre/lib/%%ARCH%%/libnative.a
57	jre/lib/%%ARCH%%/libnative.la
58	jre/lib/%%ARCH%%/libnative.so	60	jre/lib/%%ARCH%%/libnative.so
59	jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so	61	jre/lib/%%ARCH%%/libnet-%%PORTVER%%.so
60	jre/lib/%%ARCH%%/libnet.a
61	jre/lib/%%ARCH%%/libnet.la
62	jre/lib/%%ARCH%%/libnet.so	62	jre/lib/%%ARCH%%/libnet.so
63	jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so	63	jre/lib/%%ARCH%%/libnio-%%PORTVER%%.so
64	jre/lib/%%ARCH%%/libnio.a
65	jre/lib/%%ARCH%%/libnio.la
66	jre/lib/%%ARCH%%/libnio.so	64	jre/lib/%%ARCH%%/libnio.so
		65	jre/lib/%%ARCH%%/libreplace-%%PORTVER%%.so
		66	jre/lib/%%ARCH%%/libreplace.a
		67	jre/lib/%%ARCH%%/libreplace.so
67	jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so	68	jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
68	jre/lib/%%ARCH%%/libsecurity.a
69	jre/lib/%%ARCH%%/libsecurity.la
70	jre/lib/%%ARCH%%/libsecurity.so	69	jre/lib/%%ARCH%%/libsecurity.so
		70	jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
		71	jre/lib/%%ARCH%%/libtritonusesd.so
71	jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so	72	jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
72	jre/lib/%%ARCH%%/libzip.a
73	jre/lib/%%ARCH%%/libzip.la
74	jre/lib/%%ARCH%%/libzip.so	73	jre/lib/%%ARCH%%/libzip.so
75	%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so	74	jre/lib/logging.properties
76	%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.a
77	%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.la
78	%%SUB_ESOUND%%jre/lib/%%ARCH%%/libtritonusesd.so
79	jre/lib/security/java.security
80	jre/lib/rt.jar	75	jre/lib/rt.jar
81	lib/kjc.jar	76	jre/lib/security/java.security
		77	jre/lib/tools.jar
		78	lib/awt/font.properties
82	%%DATADIR%%/BUILD_ENVIRONMENT	79	%%DATADIR%%/BUILD_ENVIRONMENT
83	%%DATADIR%%/license.terms	80	%%DATADIR%%/license.terms
		81	share/locale/fr/LC_MESSAGES/kaffe.mo
		82	share/locale/zh_TW/LC_MESSAGES/kaffe.mo
84	@dirrm include/kaffe	83	@dirrm include/kaffe
85	@dirrm jre/bin	84	@dirrm jre/bin
86	@dirrm jre/lib/%%ARCH%%	85	@dirrm jre/lib/%%ARCH%%

Removed Link Here

(-)files/patch-inetaddressimpl (-12 lines)
1	--- libraries/clib/net/InetAddressImpl.c.orig Wed Dec 31 13:43:03 2003
2	+++ libraries/clib/net/InetAddressImpl.c Wed Dec 31 13:43:09 2003
3	@@ -241,7 +241,9 @@
4	"Unable to contact name server");
5	break;
6	case EAI_NONAME:
7	+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
8	case EAI_NODATA:
9	+#endif
10	postExceptionMessage(&einfo,
11	JAVA_NET(UnknownHostException),
12	"Unknown host: %s",

Removed Link Here

(-)files/patch-kaffe_kaffevm_jit3_labels.c (-13 lines)
1
2	$FreeBSD: ports/java/kaffe/files/patch-kaffe_kaffevm_jit3_labels.c,v 1.1 2005/01/10 11:04:50 edwin Exp $
3
4	--- kaffe/kaffevm/jit3/labels.c.orig
5	+++ kaffe/kaffevm/jit3/labels.c
6	@@ -217,6 +217,7 @@
7	#endif
8	ABORT();
9	#endif
10	+ break;
11	}
12	#if 0
13	/*