From bkoenig@alpha-tierchen.de  Thu Jan 15 19:45:52 2009
Return-Path: <bkoenig@alpha-tierchen.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C5B21106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jan 2009 19:45:52 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203])
	by mx1.freebsd.org (Postfix) with ESMTP id 87F7A8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jan 2009 19:45:52 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from home.alpha-tierchen.de (port-87-234-81-139.dynamic.qsc.de [87.234.81.139])
	by mail.liberty-hosting.de (Postfix) with ESMTP id 4A3433E8E6C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jan 2009 20:38:32 +0100 (CET)
Received: by home.alpha-tierchen.de (Postfix, from userid 2000)
	id 23FDB2858B; Thu, 15 Jan 2009 20:45:35 +0100 (CET)
Message-Id: <20090115194535.23FDB2858B@home.alpha-tierchen.de>
Date: Thu, 15 Jan 2009 20:45:35 +0100 (CET)
From: Bjrn Knig <bkoenig@alpha-tierchen.de>
Reply-To: Bjrn Knig <bkoenig@alpha-tierchen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix java/cacao urgently.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         130594
>Category:       ports
>Synopsis:       Fix java/cacao urgently.
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 15 19:50:00 UTC 2009
>Closed-Date:    Fri Jan 16 07:36:23 UTC 2009
>Last-Modified:  Fri Jan 16 07:40:01 UTC 2009
>Originator:     Bjrn Knig
>Release:        
>Organization:
>Environment:
>Description:
	This PR in conjunction with ports/130584 fixes the port java/cacao
	and saves it from removal on 2009-01-19.

	I'd like to take maintainership.
	An update to 0.99.3 will follow soon.

>How-To-Repeat:
	
>Fix:

	

--- ports-java-cacao.diff begins here ---
diff --git ports/java/cacao/Makefile ports/java/cacao/Makefile
index b97cc59..51a8ea4 100644
--- ports/java/cacao/Makefile
+++ ports/java/cacao/Makefile
@@ -6,19 +6,15 @@
 
 PORTNAME=	cacao
 PORTVERSION=	0.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	JIT compiler for JAVA
 
 BUILD_DEPENDS=	${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
 
-BROKEN=		does not configure
-DEPRECATED=	has been broken for more than 6 months
-EXPIRATION_DATE=2009-01-19
-
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USE_JAVA=	yes
diff --git ports/java/cacao/files/patch-src-native-jni.h ports/java/cacao/files/patch-src-native-jni.h
new file mode 100644
index 0000000..048fa57
--- /dev/null
+++ ports/java/cacao/files/patch-src-native-jni.h
@@ -0,0 +1,16 @@
+--- src/native/jni.h.orig	2007-04-02 13:23:24.000000000 +0200
++++ src/native/jni.h	2009-01-15 20:32:31.000000000 +0100
+@@ -45,10 +45,12 @@
+ 
+ #include CLASSPATH_JNI_H
+ 
+-
+ #ifndef _JNI_H
+ #define _JNI_H
+ 
++#define JNINativeInterface JNINativeInterface_
++#define JNIInvokeInterface JNIInvokeInterface_
++
+ /* forward typedefs ***********************************************************/
+ 
+ typedef struct localref_table localref_table;
--- ports-java-cacao.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Thu Jan 15 21:20:13 UTC 2009 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130594 

From: Beech Rintoul <beech@freebsd.org>
To: =?iso-8859-1?q?Bj=F6rn_K=F6nig?= <bkoenig@alpha-tierchen.de>
Cc: Bug Followup <bug-followup@freebsd.org>,
 Beech Rintoul <beech@freebsd.org>
Subject: Re: ports/130594: Fix java/cacao urgently
Date: Thu, 15 Jan 2009 13:02:00 -0900

 Port does not build:
 
 http://stargate.alaskaparadise.com/tb/errors/8.0-FreeBSD/cacao-0.98_2.log
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail   | http://people.freebsd.org/~beech
  X  - NO Word docs in e-mail | Skype: akbeech
 / \  - http://www.FreeBSD.org/releases/7.1R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 
 

From: "Bjoern Koenig" <bkoenig@alpha-tierchen.de>
To: "Beech Rintoul" <beech@freebsd.org>
Cc: =?iso-8859-1?Q?Bj=F6rn_K=F6nig?= <bkoenig@alpha-tierchen.de>,
 "Bug Followup" <bug-followup@freebsd.org>,
 "Beech Rintoul" <beech@freebsd.org>
Subject: Re: ports/130594: Fix java/cacao urgently
Date: Fri, 16 Jan 2009 07:11:42 +0100 (CET)

 > Port does not build:
 >
 > http://stargate.alaskaparadise.com/tb/errors/8.0-FreeBSD/cacao-0.98_2.log
 > --
 
 Yes, because it requires ports/130584 to be committed first.
 
 Bjrn
 
 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Fri Jan 16 07:36:09 UTC 2009 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130594 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/130594: commit references a PR
Date: Fri, 16 Jan 2009 07:35:42 +0000 (UTC)

 beech       2009-01-16 07:35:27 UTC
 
   FreeBSD ports repository
 
   Modified files:
     java/cacao           Makefile 
   Added files:
     java/cacao/files     patch-src-native-jni.h 
   Log:
   - Unbreak
   - Pass maintainership to submitter
   
   PR:             ports/130594
   Submitted by:   Bjorn Konig <bkoenig@alpha-tierchen.de>
   
   Revision  Changes    Path
   1.9       +2 -6      ports/java/cacao/Makefile
   1.1       +16 -0     ports/java/cacao/files/patch-src-native-jni.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
