Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Mar 1997 14:12:13 +0100 (MET)
From:      xaa@stack.nl
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/2931: kaffe 0.8.2
Message-ID:  <199703101312.OAA17287@alterego.stack.nl>
Resent-Message-ID: <199703101320.FAA19424@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         2931
>Category:       ports
>Synopsis:       Update
>Confidential:   yes
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 10 05:20:01 PST 1997
>Last-Modified:
>Originator:     Mark Huizer
>Organization:
>Release:        FreeBSD 3.0-CURRENT i386
>Environment:

 	lots o' coffee, nice apple pie will do nicely as well	

>Description:


>How-To-Repeat:


>Fix:

cd /usr/ports/lang
patch <myfix
	
diff -udr /usr/ports/myports/kaffe/Makefile kaffe/Makefile
--- /usr/ports/myports/kaffe/Makefile	Mon Mar 10 11:36:19 1997
+++ kaffe/Makefile	Wed Mar  5 16:59:45 1997
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    kaffe
-# Version required:     0.8.2
-# Date created:         10 March 1997
+# Version required:     0.8.0
+# Date created:         10 February 1997
 # Whom:                 Mark Huizer <xaa@stack.nl>
 #
 # $Id: Makefile,v 1.19 1997/03/03 13:57:16 tg Exp $
 #
 
-DISTNAME=	kaffe-0.8.2
+DISTNAME=	kaffe-0.8.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}.tgz kaffe-0.8.2-package-biss-net.com.tgz
+DISTFILES=	${DISTNAME}.tgz kaffe-0.8.1-package-biss-net.com.tgz
 
 MAINTAINER=	xaa@stack.nl
 
@@ -19,8 +19,8 @@
 GNU_CONFIGURE=	yes
 MAN1=		kaffe.1
 
-#do-configure:
-#		@(cd ${WRKSRC}; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+do-configure:
+		@(cd ${WRKSRC}; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 pre-install:
 	@( if test "`${MD5} ${PREFIX}/share/java/classes.zip | ${AWK} '{print $$4}'`" != "`cat ${FILESDIR}/classes.zip.1.02.md5`" ; then \
diff -udr /usr/ports/myports/kaffe/files/md5 kaffe/files/md5
--- /usr/ports/myports/kaffe/files/md5	Mon Mar 10 11:27:41 1997
+++ kaffe/files/md5	Wed Mar  5 16:59:53 1997
@@ -1,2 +1,2 @@
-MD5 (kaffe-0.8.2.tgz) = 6c7dee1fff12d4fa908dd418f54ee33f
-MD5 (kaffe-0.8.2-package-biss-net.com.tgz) = 5ec84db8212b85e3f68d86b915cfd2bf
+MD5 (kaffe-0.8.1.tgz) = e120b969f896ce5b99d21b643952dad9
+MD5 (kaffe-0.8.1-package-biss-net.com.tgz) = cbda1b62761bdac775c3901e782075b8
diff -udr /usr/ports/myports/kaffe/patches/patch-aa kaffe/patches/patch-aa
--- /usr/ports/myports/kaffe/patches/patch-aa	Mon Mar 10 12:22:57 1997
+++ kaffe/patches/patch-aa	Mon Mar  3 14:57:25 1997
@@ -1,105 +1,103 @@
-diff -udr ../../kaffe-0.8.2/configure ./configure
---- ../../kaffe-0.8.2/configure	Thu Feb 27 18:46:21 1997
-+++ ./configure	Mon Mar 10 12:18:56 1997
-@@ -701,7 +701,7 @@
- case "$host_cpu-$host_os" in
- 
- 
--i[3456]86-freebsd2*)
-+i[3456]86-freebsd[23]*)
- 	host_cpu=i386
- 	host_os=freebsd2
- 	PIC=-fPIC
-@@ -4344,7 +4344,7 @@
- 
- if test "$SYSTEM" = "unix" ; then
- 	if test "$awt_toolkit" != "none" ; then
--		echo CLASSPATH=.:$datadir/kaffe/classes.zip:$datadir/kaffe/$awt_toolkit.zip > ENVIRONMENT
-+		echo CLASSPATH=.:$datadir/java/classes.zip:$datadir/kaffe/$awt_toolkit.zip > ENVIRONMENT
- 	else
- 		echo CLASSPATH=.:$datadir/kaffe/classes.zip > ENVIRONMENT
- 	fi
-diff -udr ../../kaffe-0.8.2/kaffe/kaffe/Makefile.in ./kaffe/kaffe/Makefile.in
---- ../../kaffe-0.8.2/kaffe/kaffe/Makefile.in	Wed Feb 26 10:52:07 1997
-+++ ./kaffe/kaffe/Makefile.in	Mon Mar 10 12:18:56 1997
+diff -udr ../../kaffe-0.8.1/kaffe/kaffe/Makefile.in ./kaffe/kaffe/Makefile.in
+--- ../../kaffe-0.8.1/kaffe/kaffe/Makefile.in	Thu Feb 13 10:46:45 1997
++++ ./kaffe/kaffe/Makefile.in	Fri Feb 28 23:08:24 1997
 @@ -18,7 +18,7 @@
  MKDIR=		@MKDIR@
  CC=		@CC@
  INCLUDES=	-I. -I$(srcdir)/../kaffevm -I../../config -I$(srcdir)/../../config -I../../include
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
++#CFLAGS=		@CFLAGS@
  ALL_CFLAGS=	$(CFLAGS) @KAFFEFLAGS@ $(INCLUDES)
- LIBS=		@NOSHAREDLIBS@
+ LIBS=		@NOSHAREDLIBS@ @LIBS@
  OBJEXT=		@OBJEXT@
-diff -udr ../../kaffe-0.8.2/kaffe/kaffeh/Makefile.in ./kaffe/kaffeh/Makefile.in
---- ../../kaffe-0.8.2/kaffe/kaffeh/Makefile.in	Thu Feb 27 16:41:51 1997
-+++ ./kaffe/kaffeh/Makefile.in	Mon Mar 10 12:18:56 1997
+diff -udr ../../kaffe-0.8.1/kaffe/kaffeh/Makefile.in ./kaffe/kaffeh/Makefile.in
+--- ../../kaffe-0.8.1/kaffe/kaffeh/Makefile.in	Thu Feb 13 10:51:24 1997
++++ ./kaffe/kaffeh/Makefile.in	Fri Feb 28 23:08:26 1997
 @@ -17,7 +17,7 @@
  MKDIR=		@MKDIR@
  CC=		@CC@
  INCLUDES=	-I. -I$(srcdir) -I../../config -I$(srcdir)/../kaffevm -I$(srcdir)/../../config -I../../include
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
++#CFLAGS=		@CFLAGS@
  ALL_CFLAGS=	$(CFLAGS) $(INCLUDES) -DKAFFEH -DKVER=\"@KVER@\"
  LDFLAGS=	@LDFLAGS@
  LIBS=		@LIBS@
-diff -udr ../../kaffe-0.8.2/kaffe/kaffevm/Makefile.in ./kaffe/kaffevm/Makefile.in
---- ../../kaffe-0.8.2/kaffe/kaffevm/Makefile.in	Wed Feb 26 10:05:43 1997
-+++ ./kaffe/kaffevm/Makefile.in	Mon Mar 10 12:18:56 1997
+diff -udr ../../kaffe-0.8.1/kaffe/kaffevm/Makefile.in ./kaffe/kaffevm/Makefile.in
+--- ../../kaffe-0.8.1/kaffe/kaffevm/Makefile.in	Thu Feb 13 10:49:15 1997
++++ ./kaffe/kaffevm/Makefile.in	Fri Feb 28 23:08:29 1997
 @@ -30,7 +30,7 @@
  LIBEXT=		@LIBEXT@
  
  INCLUDES=	-I. -I$(srcdir) -I$(srcdir)/../../config -I../../config -I../../include
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
++#CFLAGS=		@CFLAGS@
  ALL_CFLAGS=	$(CFLAGS) @KAFFEVMFLAGS@ $(INCLUDES) $(ENGINE_CFLAGS) -DKVER=\"$(KVER)\"
  
  LIBNAME=	libkaffe_vm
-diff -udr ../../kaffe-0.8.2/packages/biss-net.com/APIawt/lib/Makefile.in ./packages/biss-net.com/APIawt/lib/Makefile.in
---- ../../kaffe-0.8.2/packages/biss-net.com/APIawt/lib/Makefile.in	Wed Feb 26 15:48:54 1997
-+++ ./packages/biss-net.com/APIawt/lib/Makefile.in	Mon Mar 10 12:18:56 1997
+diff -udr ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in
+--- ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in	Tue Feb 11 10:00:25 1997
++++ ./packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in	Fri Feb 28 23:08:50 1997
 @@ -17,7 +17,7 @@
  AR=		@AR@
  RANLIB=		@RANLIB@
- INCLUDES=	-I$(srcdir) -I$(srcdir)/../../../../include -I../../../../include
+ INCLUDES=	-I$(srcdir) -I../../../../include -I$(srcdir)/../../../../include -I../../../../config -I$(srcdir)/../../../../config
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
- X_INCLUDES=	@X_INCLUDES@
- ALL_CFLAGS=	$(CFLAGS) $(INCLUDES) $(X_INCLUDES) -DKAFFE
++#CFLAGS=		@CFLAGS@
+ ALL_CFLAGS=	$(CFLAGS) $(INCLUDES)
  INSTALL=	@INSTALL@
-diff -udr ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in
---- ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in	Tue Feb 11 10:00:26 1997
-+++ ./packages/tjwassoc.demon.co.uk/APIagent/lib/Makefile.in	Mon Mar 10 12:18:57 1997
+ INSTALL_DATA=	@INSTALL_DATA@
+diff -udr ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in
+--- ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in	Tue Feb 11 10:00:14 1997
++++ ./packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in	Fri Feb 28 23:08:53 1997
 @@ -17,7 +17,7 @@
  AR=		@AR@
  RANLIB=		@RANLIB@
  INCLUDES=	-I$(srcdir) -I../../../../include -I$(srcdir)/../../../../include -I../../../../config -I$(srcdir)/../../../../config
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
++#CFLAGS=		@CFLAGS@
  ALL_CFLAGS=	$(CFLAGS) $(INCLUDES)
  INSTALL=	@INSTALL@
  INSTALL_DATA=	@INSTALL_DATA@
-diff -udr ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in
---- ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in	Wed Feb 26 10:08:33 1997
-+++ ./packages/tjwassoc.demon.co.uk/APIcore/lib/Makefile.in	Mon Mar 10 12:18:57 1997
+diff -udr ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in
+--- ../../kaffe-0.8.1/packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in	Tue Feb 11 10:00:33 1997
++++ ./packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in	Fri Feb 28 23:08:55 1997
 @@ -17,7 +17,7 @@
  AR=		@AR@
  RANLIB=		@RANLIB@
  INCLUDES=	-I$(srcdir) -I../../../../include -I$(srcdir)/../../../../include -I../../../../config -I$(srcdir)/../../../../config
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
++#CFLAGS=		@CFLAGS@
  ALL_CFLAGS=	$(CFLAGS) $(INCLUDES)
  INSTALL=	@INSTALL@
  INSTALL_DATA=	@INSTALL_DATA@
-diff -udr ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in ./packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in
---- ../../kaffe-0.8.2/packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in	Wed Feb 26 10:06:27 1997
-+++ ./packages/tjwassoc.demon.co.uk/APInet/lib/Makefile.in	Mon Mar 10 12:18:57 1997
+--- packages/biss-net.com/APIawt/lib/Makefile.in.orig	Tue Feb 11 10:01:04 1997
++++ packages/biss-net.com/APIawt/lib/Makefile.in	Mon Mar  3 13:39:18 1997
 @@ -17,7 +17,7 @@
  AR=		@AR@
  RANLIB=		@RANLIB@
- INCLUDES=	-I$(srcdir) -I../../../../include -I$(srcdir)/../../../../include -I../../../../config -I$(srcdir)/../../../../config
+ INCLUDES=	-I$(srcdir) -I$(srcdir)/../../../../include -I../../../../include
 -CFLAGS=		@CFLAGS@
-+CFLAGS+=		@CFLAGS@
- ALL_CFLAGS=	$(CFLAGS) $(INCLUDES)
- INSTALL=	@INSTALL@
- INSTALL_DATA=	@INSTALL_DATA@
++#CFLAGS=		@CFLAGS@
+ X_INCLUDES=	@X_INCLUDES@
+ X_LIBRARIES=	@X_LIBRARIES@ -lX11
+ ALL_CFLAGS=	$(CFLAGS) $(INCLUDES) $(X_INCLUDES) -DKAFFE
+--- ../../kaffe-0.8.1/configure	Mon Feb 17 10:41:06 1997
++++ ./configure	Fri Feb 28 23:15:27 1997
+@@ -577,7 +577,7 @@
+ case "$host_cpu-$host_os" in
+ 
+ 
+-i[3456]86-freebsd2*)
++i[3456]86-freebsd[23]*)
+ 	host_cpu=i386
+ 	host_os=freebsd2
+ 	PIC=-fPIC
+@@ -4261,7 +4261,7 @@
+ 
+ if test "$SYSTEM" = "unix" ; then
+ 	if test "$awt_toolkit" != "none" ; then
+-		echo CLASSPATH=.:$datadir/kaffe/classes.zip:$datadir/kaffe/$awt_toolkit.zip > ENVIRONMENT
++		echo CLASSPATH=.:$datadir/kaffe/classes.zip:$datadir/kaffe/$awt_toolkit.zip:$datadir/java/classes.zip > ENVIRONMENT
+ 	else
+ 		echo CLASSPATH=.:$datadir/kaffe/classes.zip > ENVIRONMENT
+ 	fi
diff -udr /usr/ports/myports/kaffe/pkg/DESCR kaffe/pkg/DESCR
--- /usr/ports/myports/kaffe/pkg/DESCR	Mon Mar 10 14:01:21 1997
+++ kaffe/pkg/DESCR	Wed Mar  5 16:59:54 1997
@@ -1,3 +1,4 @@
+===========================================================================
 This is Kaffe, a virtual machine design to execute Java bytecode.
 This machine can be configured in two modes.  In one mode it operates as
 a pure bytecode interpreter (not unlike Javasoft's machine); in the second
@@ -16,8 +17,9 @@
  KAFFEHOME=/usr/local/share/kaffe
  LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
 
-You can run "sh /usr/local/share/kaffe/ENVIRONMENT" to have these set for
-you.
+A file "ENVIRONMENT" is generated by the configure program which contains
+a /bin/sh environment setup.  This may help you to figure out what to
+set to what if you alter the standard installation point.
 
 What's in there
 ===============
diff -udr /usr/ports/myports/kaffe/pkg/PLIST kaffe/pkg/PLIST
--- /usr/ports/myports/kaffe/pkg/PLIST	Mon Mar 10 11:36:37 1997
+++ kaffe/pkg/PLIST	Mon Mar  3 14:57:28 1997
@@ -14,13 +14,13 @@
 share/kaffe/lib/biss
 share/kaffe/lib/biss.awt
 lib/libkaffe_agent.so
-lib/libkaffe_agent.so.0.82
+lib/libkaffe_agent.so.0.81
 lib/libkaffe_bissawt.so
 lib/libkaffe_bissawt.so.0.87
 lib/libkaffe_native.so
-lib/libkaffe_native.so.0.82
+lib/libkaffe_native.so.0.81
 lib/libkaffe_vm.so
-lib/libkaffe_vm.so.0.82
+lib/libkaffe_vm.so.0.81
 lib/libkaffe_net.so
-lib/libkaffe_net.so.0.82
+lib/libkaffe_net.so.0.81
 @exec /sbin/ldconfig -m %B
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703101312.OAA17287>