5 files changed, 61 insertions, 42 deletions

diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index e9564fa7998e..258bd426d062 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -6,60 +6,42 @@
 #
 
 PORTNAME=	jruby
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.2
 CATEGORIES=	lang ruby java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${BINDIST}
+DISTNAME=	${PORTNAME}-bin-${PORTVERSION}
 DIST_SUBDIR=	ruby
-EXTRACT_ONLY=	${BINDIST}
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${JAVA}:${PORTSDIR}/java/javavmwrapper
-#RUN_DEPENDS=	${JAVA}:${PORTSDIR}/java/linux-jdk13
+USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+NO_BUILD=	yes
 
-JAVA?=		${LOCALBASE}/bin/javavm
+JRUBY_HOME?=	${PREFIX}/share/${PORTNAME}
 
-BINDIST=	${PORTNAME}-${PORTVERSION:S/./_/g}${EXTRACT_SUFX}
-SRCDIST=	${PORTNAME}-src-${PORTVERSION:S/./_/g}${EXTRACT_SUFX}
-
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${SRCDIST}
-
-FILES=		README samples src
-.endif
+PLIST_SUB=	JRUBY_HOME="${JRUBY_HOME:S,^${PREFIX}/,,}"
 
 post-extract:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${WRKSRC}/src
-	cd ${WRKSRC}/src; ${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/${SRCDIST}
-.endif
-	${FIND} ${WRKSRC} -name '*.swp' -delete
+	${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+	${RM} ${WRKSRC}/lib/COPYING.LIB
 
-do-build:
-	( \
-	${ECHO_CMD} '#!/bin/sh'; \
-	${ECHO_CMD} 'exec ${JAVA} -jar ${PREFIX}/share/java/classes/jruby.jar "$$@"'; \
-	) > ${WRKSRC}/jruby
+post-patch:
+	${REINPLACE_CMD} -e 's,!!JRUBY_HOME!!,${JRUBY_HOME},g' \
+		${WRKSRC}/bin/jruby.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/jruby ${PREFIX}/bin/
-	${MKDIR} ${PREFIX}/share/java/classes
-	${INSTALL_DATA} ${WRKSRC}/jruby.jar ${PREFIX}/share/java/classes/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/java/${PORTNAME}
-	cd ${WRKSRC}; ${CP} -R ${FILES} ${PREFIX}/share/java/${PORTNAME}/
-.endif
-
-post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/jruby.sh ${PREFIX}/bin/jruby
+	${MKDIR} ${JRUBY_HOME}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${JRUBY_HOME}/lib/
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}; find ${FILES} -type f | sort | ${SED} 's,^,share/java/${PORTNAME}/,' >> ${TMPPLIST}
-	cd ${WRKSRC}; find ${FILES} -type d | sort -r | ${SED} 's,^,@dirrm share/java/${PORTNAME}/,' >> ${TMPPLIST}
-	${ECHO_CMD} '@dirrm share/java/${PORTNAME}' >> ${TMPPLIST}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR}/
 .endif
-	${ECHO_CMD} '@unexec ${RMDIR} %D/share/java 2> /dev/null || true' >> ${TMPPLIST}
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/jruby/distinfo b/lang/jruby/distinfo
index eeb86125330f..1434e79eceec 100644
--- a/lang/jruby/distinfo
+++ b/lang/jruby/distinfo
@@ -1,2 +1 @@
-MD5 (ruby/jruby-0_5_1.tar.gz) = c119187311e3402ff952c981094f2d38
-MD5 (ruby/jruby-src-0_5_1.tar.gz) = 788b7fa96a06983db3ab7603d7ac43ff
+MD5 (ruby/jruby-bin-0.5.2.tar.gz) = 030309dc7e6bc5ca209674e0544ca397
diff --git a/lang/jruby/files/patch-bin::jruby.sh b/lang/jruby/files/patch-bin::jruby.sh
new file mode 100644
index 000000000000..63278a12b7df
--- /dev/null
+++ b/lang/jruby/files/patch-bin::jruby.sh
@@ -0,0 +1,7 @@
+--- bin/jruby.sh.orig	Fri Sep 13 05:24:44 2002
++++ bin/jruby.sh	Wed Oct  9 02:36:39 2002
+@@ -22,2 +22,4 @@
+ 
++JRUBY_HOME="${JRUBY_HOME:-!!JRUBY_HOME!!}"
++
+ if [ -z "$JRUBY_HOME" ] ; then
diff --git a/lang/jruby/pkg-message b/lang/jruby/pkg-message
new file mode 100644
index 000000000000..9122e197a818
--- /dev/null
+++ b/lang/jruby/pkg-message
@@ -0,0 +1,3 @@
+----------------------------------------------------------------------
+To run JRuby, install JDK 1.3.1 or higher and set JAVA_HOME properly.
+----------------------------------------------------------------------
diff --git a/lang/jruby/pkg-plist b/lang/jruby/pkg-plist
index 59bf9b464e0d..2845e09bddbe 100644
--- a/lang/jruby/pkg-plist
+++ b/lang/jruby/pkg-plist
@@ -1,3 +1,31 @@
 bin/jruby
-share/java/classes/jruby.jar
-@unexec rmdir %D/share/java/classes 2> /dev/null || true
+%%JRUBY_HOME%%/lib/LICENSE.ant
+%%JRUBY_HOME%%/lib/LICENSE.jakarta-oro
+%%JRUBY_HOME%%/lib/ant.jar
+%%JRUBY_HOME%%/lib/bsf.jar
+%%JRUBY_HOME%%/lib/gnu-regexp-1.1.4.jar
+%%JRUBY_HOME%%/lib/jakarta-oro-2.0.6.jar
+%%JRUBY_HOME%%/lib/jruby.jar
+%%JRUBY_HOME%%/lib/junit.jar
+%%JRUBY_HOME%%/lib/license.bsf.html
+@dirrm %%JRUBY_HOME%%/lib
+@dirrm %%JRUBY_HOME%%
+%%PORTDOCS%%share/doc/jruby/BeanScriptingFramework
+%%PORTDOCS%%share/doc/jruby/Glossary.txt
+%%PORTDOCS%%share/doc/jruby/Javasupport-highlevel.txt
+%%PORTDOCS%%share/doc/jruby/Javasupport-lowlevel.txt
+%%PORTDOCS%%share/doc/jruby/Javasupport-overview.txt
+%%PORTDOCS%%share/doc/jruby/README
+%%PORTDOCS%%share/doc/jruby/README.test
+%%PORTDOCS%%share/doc/jruby/TODO
+%%PORTDOCS%%share/doc/jruby/changelog.xml
+%%PORTDOCS%%@dirrm share/doc/jruby
+%%PORTDOCS%%share/examples/jruby/beer.rb
+%%PORTDOCS%%share/examples/jruby/error.rb
+%%PORTDOCS%%share/examples/jruby/eval.rb
+%%PORTDOCS%%share/examples/jruby/fib.rb
+%%PORTDOCS%%share/examples/jruby/java2.rb
+%%PORTDOCS%%share/examples/jruby/swing.rb
+%%PORTDOCS%%share/examples/jruby/swing2.rb
+%%PORTDOCS%%share/examples/jruby/thread.rb
+%%PORTDOCS%%@dirrm share/examples/jruby