4 files changed, 19 insertions, 145 deletions

diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index 288d05a7c21a..7f6faace31dc 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	jasmin
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	2.3
 PORTEPOCH=	1
 CATEGORIES=	java lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemoliu@gmail.com
 COMMENT=	Java Assembler Interface
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
-
 USE_ZIP=	yes
 USE_ANT=	yes
 ALL_TARGET=	jasmin
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
+USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	.*\.(txt|xml|j|class|java|mf|css|bnf|html)
 
 SUB_FILES=	jasmin.sh
 
diff --git a/java/jasmin/distinfo b/java/jasmin/distinfo
index 161a46bae86e..ec988ba19033 100644
--- a/java/jasmin/distinfo
+++ b/java/jasmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (jasmin-1.1.zip) = bb96616023ab4efdffa173601004fa17
-SHA256 (jasmin-1.1.zip) = ec6f2c035d80158e7e8878f18f95ad4161a11abba2be33cdb151b9f5a02fe8ec
-SIZE (jasmin-1.1.zip) = 1602998
+MD5 (jasmin-2.3.zip) = 0ea558feebd085b4fd2228f4ad4d6edb
+SHA256 (jasmin-2.3.zip) = 29bd248c4802a7cd7b02d4e80dc1d7cd4738d6c0e4fe10c38fb6ccaf86dab758
+SIZE (jasmin-2.3.zip) = 1304210
diff --git a/java/jasmin/pkg-descr b/java/jasmin/pkg-descr
index 4c9a17a8b390..96545a42e4ce 100644
--- a/java/jasmin/pkg-descr
+++ b/java/jasmin/pkg-descr
@@ -3,4 +3,4 @@ classes, written in a simple assembler-like syntax and using the Java Virtual
 Machine instruction set. It converts them into binary Java class files 
 suitable for loading into a JVM implementation.
 
-WWW: http://mrl.nyu.edu/~meyer/jasmin/
+WWW: http://jasmin.sourceforge.net/
diff --git a/java/jasmin/pkg-plist b/java/jasmin/pkg-plist
index 5989e4e96df0..9860f4dabd54 100644
--- a/java/jasmin/pkg-plist
+++ b/java/jasmin/pkg-plist
@@ -1,6 +1,12 @@
-@comment $FreeBSD$
-%%JAVAJARDIR%%/jasmin.jar
 bin/jasmin
+%%DOCSDIR%%/about.html
+%%DOCSDIR%%/guide.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/instructions.html
+%%DOCSDIR%%/jasmin_icon.jpg
+%%DOCSDIR%%/javavm.gif
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/syntax.bnf
 %%EXAMPLESDIR%%/ANewArray.j
 %%EXAMPLESDIR%%/AnInterface.j
 %%EXAMPLESDIR%%/Arrays.j
@@ -9,6 +15,7 @@ bin/jasmin
 %%EXAMPLESDIR%%/Count.j
 %%EXAMPLESDIR%%/HelloWeb.html
 %%EXAMPLESDIR%%/HelloWeb.j
+%%EXAMPLESDIR%%/HelloWorld.class
 %%EXAMPLESDIR%%/HelloWorld.j
 %%EXAMPLESDIR%%/Implementor.j
 %%EXAMPLESDIR%%/InvokeInterface.j
@@ -19,138 +26,6 @@ bin/jasmin
 %%EXAMPLESDIR%%/Uncaught.j
 %%EXAMPLESDIR%%/VerifyTest.j
 %%EXAMPLESDIR%%/VerifyTest1.j
+share/java/classes/jasmin.jar
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/about.html
-%%PORTDOCS%%%%DOCSDIR%%/api/allclasses-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/api/allclasses-noframe.html
-%%PORTDOCS%%%%DOCSDIR%%/api/constant-values.html
-%%PORTDOCS%%%%DOCSDIR%%/api/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/api/help-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-1.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-10.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-11.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-12.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-13.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-14.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-15.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-16.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-17.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-18.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-19.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-2.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-20.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-3.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-4.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-5.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-6.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-7.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-8.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index-files/index-9.html
-%%PORTDOCS%%%%DOCSDIR%%/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/AsciiCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/CP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/CatchEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/Catchtable.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/ClassCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/ClassEnv.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/CodeAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/ConstAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/DoubleCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/ExceptAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/FieldCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/FloatCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/GenericAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/IincInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/Insn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/IntegerCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/InterfaceCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/InvokeinterfaceInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/Label.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/LineTableAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/LocalVarEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/LocalVarTableAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/LongCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/LookupswitchInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/Method.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/MethodCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/MultiarrayInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/NameTypeCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/RuntimeConstants.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/SourceAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/StringCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/TableswitchInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/Var.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/AsciiCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/CP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/CatchEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/Catchtable.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/ClassCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/ClassEnv.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/CodeAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/ConstAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/DoubleCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/ExceptAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/FieldCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/FloatCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/GenericAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/IincInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/Insn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/IntegerCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/InterfaceCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/InvokeinterfaceInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/Label.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/LineTableAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/LocalVarEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/LocalVarTableAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/LongCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/LookupswitchInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/Method.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/MethodCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/MultiarrayInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/NameTypeCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/RuntimeConstants.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/SourceAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/StringCP.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/TableswitchInsn.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/Var.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/class-use/jasError.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/jasError.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jas/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/ClassFile.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/Main.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/class-use/ClassFile.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/class-use/Main.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/class-use/parser.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/class-use/sym.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/package-use.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/parser.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin/sym.html
-%%PORTDOCS%%%%DOCSDIR%%/api/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/api/overview-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/api/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/api/package-list
-%%PORTDOCS%%%%DOCSDIR%%/api/packages.html
-%%PORTDOCS%%%%DOCSDIR%%/api/resources/inherit.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/serialized-form.html
-%%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css
-%%PORTDOCS%%%%DOCSDIR%%/guide.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/instructions.html
-%%PORTDOCS%%%%DOCSDIR%%/jasmin_icon.jpg
-%%PORTDOCS%%%%DOCSDIR%%/javavm.gif
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/syntax.bnf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/index-files
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/jas/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/jas
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/jasmin/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/jasmin
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DOCSDIR%%