4 files changed, 72 insertions, 25 deletions

diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index afc2e56a0e28..6855a87b3b79 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -7,21 +7,35 @@
 #
 
 PORTNAME=	Inline-Java
-PORTVERSION=	0.33
+PORTVERSION=	0.50.91
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Inline
+MASTER_SITE_SUBDIR=	../by-authors/id/P/PA/PATL
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-0.50_91
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lars@balker.dk
 COMMENT=	Write Perl subroutines and classes in Java
 
-BUILD_DEPENDS=	${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS=	p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \
+		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_JAVA=       yes
+JAVA_VERSION=   1.4+
+JAVA_OS=        native
+
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	</dev/null
+CONFIGURE_ARGS=	J2SDK=${JAVA_HOME} </dev/null
+
+MAN3=		Inline::Java.3 \
+		Inline::Java::Callback.3
 
-MAN3=		Inline::Java.3
+post-configure:
+	${MAKE} -C ${WRKSRC} java
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${PERL_LEVEL} < 500801
+IGNORE=	requires at least Perl 5.8.1. Install lang/perl5.8, and try again
+.endif
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Inline-Java/distinfo b/devel/p5-Inline-Java/distinfo
index 7bd1edc940d4..9d1c1e74d5b8 100644
--- a/devel/p5-Inline-Java/distinfo
+++ b/devel/p5-Inline-Java/distinfo
@@ -1,3 +1,3 @@
-MD5 (Inline-Java-0.33.tar.gz) = 4c7da1744ffa5a56d0f8dfa586791899
-SHA256 (Inline-Java-0.33.tar.gz) = 1cab11f80fe0d9c0e0bf014559d6a10947fd679cf1b3370ebcc13b30bdf3672a
-SIZE (Inline-Java-0.33.tar.gz) = 57591
+MD5 (Inline-Java-0.50_91.tar.gz) = 2dce4b7908e6dbe23450f1b6a37df467
+SHA256 (Inline-Java-0.50_91.tar.gz) = 698c228222524442e9c0c3c21fe87c09766b490395a648bb8099be45473fc129
+SIZE (Inline-Java-0.50_91.tar.gz) = 90206
diff --git a/devel/p5-Inline-Java/pkg-descr b/devel/p5-Inline-Java/pkg-descr
index eda712daeab9..73c9f734082f 100644
--- a/devel/p5-Inline-Java/pkg-descr
+++ b/devel/p5-Inline-Java/pkg-descr
@@ -1,11 +1,11 @@
 The Inline::Java module allows you to put Java source code directly "inline"
 in a Perl script or module. A Java compiler is launched and the Java code is
-compiled. Then Perl asks the Java classes what public methods have been
+compiled. Then Perl asks the Java classes what public methods have been 
 defined. These classes and methods are available to the Perl program as if
 they had been written in Perl.
 
 The process of interrogating the Java classes for public methods occurs the
-first time you run your Java code. The namespace is cached, and subsequent
+first time you run your Java code. The namespace is cached, and subsequent 
 calls use the cached version.
 
 WWW: http://search.cpan.org/dist/Inline-Java/
diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist
index 5c1c0e578414..b06b1c5bb0c7 100644
--- a/devel/p5-Inline-Java/pkg-plist
+++ b/devel/p5-Inline-Java/pkg-plist
@@ -1,16 +1,49 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/.packlist
-%%SITE_PERL%%/Inline/Java.pm
-%%SITE_PERL%%/Inline/Java.pod
-%%SITE_PERL%%/Inline/Java/Array.pm
-%%SITE_PERL%%/Inline/Java/Callback.pm
-%%SITE_PERL%%/Inline/Java/Class.pm
-%%SITE_PERL%%/Inline/Java/Init.pm
-%%SITE_PERL%%/Inline/Java/JNI.pm
-%%SITE_PERL%%/Inline/Java/JVM.pm
-%%SITE_PERL%%/Inline/Java/Object.pm
-%%SITE_PERL%%/Inline/Java/Portable.pm
-%%SITE_PERL%%/Inline/Java/Protocol.pm
-@dirrm %%SITE_PERL%%/Inline/Java
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI/JNI.so
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Array.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Callback.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Callback.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Class.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Handle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/InlineJavaServer.jar
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/InlineJavaUser.jar
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/JNI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/JVM.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Portable.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Protocol.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/default_j2sdk.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaArray.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallback.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCallbackQueue.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaCastException.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaClass.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaException.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaHandle.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaInvocationTargetException.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlCaller.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlException.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlInterpreter.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlNatives.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaPerlObject.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaProtocol.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServer.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaServerThread.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaThrown.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLink.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUserClassLoader.java
+%%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java/InlineJavaUtils.java
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline/java
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl/inline
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org/perl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources/org
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java/sources
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Inline/Java
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Inline
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java/JNI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java
-@dirrmtry %%SITE_PERL%%/Inline
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline