Attachment 85884 Details for Bug 122210 – bsh-2.0.b4_1.patch

[patch] bsh-2.0.b4_1.patch

bsh-2.0.b4_1.patch (text/plain), 2.72 KB, created by Simon Olofsson on 2008-03-28 22:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Olofsson

Created: 2008-03-28 22:30:00 UTC

Size: 2.72 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/lang/bsh/Makefile /usr/home/simon/ports/lang/bsh/Makefile
>--- /usr/ports/lang/bsh/Makefile	2008-03-29 00:05:43.000000000 +0100
>+++ /usr/home/simon/ports/lang/bsh/Makefile	2008-03-29 00:08:19.000000000 +0100
>@@ -8,24 +8,32 @@
> PORTNAME=	bsh
> PORTVERSION=	2.0.b4
> PORTREVISION=	1
>-CATEGORIES=	java
>+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 -ruN --exclude=CVS /usr/ports/lang/bsh/files/bsh.sh.in /usr/home/simon/ports/lang/bsh/files/bsh.sh.in
>--- /usr/ports/lang/bsh/files/bsh.sh.in	2008-03-29 00:05:43.000000000 +0100
>+++ /usr/home/simon/ports/lang/bsh/files/bsh.sh.in	2008-03-28 23:50:40.000000000 +0100
>@@ -2,4 +2,4 @@
> #
> # $FreeBSD: ports/java/bsh/files/bsh.sh.in,v 1.2 2005/09/20 19:36:48 glewis Exp $
> 
>-JAVA_VERSION=1.2+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/bsh.jar" "$@"
>+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%JARNAME%%" "$@"
>diff -ruN --exclude=CVS /usr/ports/lang/bsh/pkg-descr /usr/home/simon/ports/lang/bsh/pkg-descr
>--- /usr/ports/lang/bsh/pkg-descr	2008-03-29 00:05:43.000000000 +0100
>+++ /usr/home/simon/ports/lang/bsh/pkg-descr	2008-03-28 22:28:40.000000000 +0100
>@@ -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/

Actions: View | Diff

Attachments on bug 122210: 85884