Index: head/lang/bsh/Makefile
===================================================================
--- head/lang/bsh/Makefile	(revision 397956)
+++ head/lang/bsh/Makefile	(revision 397957)
@@ -1,36 +1,37 @@
 # Created by: Kimura Fuyuki <fuyuki@mj.0038.net>
 # $FreeBSD$
 
 PORTNAME=	bsh
 DISTVERSION=	2.0b5
+PORTREVISION=	1
 CATEGORIES=	lang java
-MASTER_SITES=	http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Java scripting language
+MAINTAINER=	pfg@FreeBSD.org
+COMMENT=	Beanshell java scripting language
 
 LICENSE=	APACHE20
 
-USES=		zip
+USE_GITHUB=	yes
+GH_ACCOUNT=	beanshell
+GH_PROJECT=	beanshell
+GH_TAGNAME=	f299e2b
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
 USE_ANT=	yes
 ALL_TARGET=	jarall
-
-WRKSRC=		${WRKDIR}/BeanShell-${PORTVERSION:S/.b/b/}
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	JARNAME=${PORTNAME}.jar
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
 		bin/${PORTNAME}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${DISTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/lang/bsh/distinfo
===================================================================
--- head/lang/bsh/distinfo	(revision 397956)
+++ head/lang/bsh/distinfo	(revision 397957)
@@ -1,2 +1,2 @@
-SHA256 (bsh-2.0b5-src.zip) = 90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513
-SIZE (bsh-2.0b5-src.zip) = 1982036
+SHA256 (beanshell-beanshell-2.0b5-f299e2b_GH0.tar.gz) = ae789b54453c6c1e9710b63feb5711c75581ac089d72ecfa6940320e7f5ff856
+SIZE (beanshell-beanshell-2.0b5-f299e2b_GH0.tar.gz) = 1707543