- Change main category (java/bsh -> lang/bsh).

- Pass maintainership to submitter.
- Update comment and distinfo.
- Use exec in startup script.
- Adopt best practices for Java ports as described in section 6.10.3 of the Porter's Handbook.

PR:		ports/122210
Submitted by:	Simon Olofsson <simon@olofsson.de>
Repocopy by:	marcus
Approved by:	gabor (mentor, implicit)

3 files changed, 22 insertions, 16 deletions

diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile
index 6f206a514180..df55283ec087 100644
--- a/lang/bsh/Makefile
+++ b/lang/bsh/Makefile
@@ -7,25 +7,33 @@
 
 PORTNAME=	bsh
 PORTVERSION=	2.0.b4
-PORTREVISION=	2
-CATEGORIES=	java
+PORTREVISION=	3
+CATEGORIES=	lang java
 MASTER_SITES=	http://www.beanshell.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Java scripting environment
+MAINTAINER=	simon@olofsson.de
+COMMENT=	A Java scripting language
 
-PLIST_FILES=	%%JAVAJARDIR%%/bsh.jar bin/bsh
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	yes
-SUB_FILES=	bsh.sh
+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+SUB_FILES=	${PORTNAME}.sh
+SUB_LIST=	JARNAME=${PORTNAME}.jar
+
+PLIST_FILES=	%%DATADIR%%/${PORTNAME}.jar \
+		bin/${PORTNAME}
+PLIST_DIRS=	%%DATADIR%%
 
 do-install:
-	${MKDIR} ${JAVALIBDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${JAVAJARDIR}/bsh.jar
-	${INSTALL_SCRIPT} ${WRKDIR}/bsh.sh ${PREFIX}/bin/bsh
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
+		${DATADIR}/${PORTNAME}.jar
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/lang/bsh/files/bsh.sh.in b/lang/bsh/files/bsh.sh.in
index ba83bc6e545d..36ba1108ccd4 100644
--- a/lang/bsh/files/bsh.sh.in
+++ b/lang/bsh/files/bsh.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-JAVA_VERSION=1.2+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/bsh.jar" "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%JARNAME%%" "$@"
diff --git a/lang/bsh/pkg-descr b/lang/bsh/pkg-descr
index 382f718980d4..c915410cd570 100644
--- a/lang/bsh/pkg-descr
+++ b/lang/bsh/pkg-descr
@@ -1,8 +1,6 @@
-BeanShell is a small, free, embeddable, Java source interpreter with
-object scripting language features, written in Java. BeanShell
-executes standard Java statements and expressions, in addition to
-obvious scripting commands and syntax. BeanShell supports scripted
-objects as simple method closures like those in Perl and
-JavaScript(tm).
+BeanShell is a small, free, embeddable Java source interpreter with object
+scripting language features, written in Java. BeanShell dynamically executes
+standard Java syntax and extends it with common scripting conveniences such as
+loose types, commands, and method closures like those in Perl and JavaScript.
 
 WWW: http://www.beanshell.org/