3 files changed, 140 insertions, 58 deletions

diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index 7ac9039d8761..edddf578e004 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -6,34 +6,22 @@
 #
 
 PORTNAME=	jasmin
-PORTVERSION=	1.06
-CATEGORIES=	java
-MASTER_SITES=	http://www.cat.nyu.edu/~meyer/jasmin/
+PORTVERSION=	1.1
+PORTEPOCH=	1
+CATEGORIES=	java lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	plexus@snafu.de
 COMMENT=	Java Assembler Interface
 
-USE_JAVA=	1.1+
-NEED_JAVAC=	yes
-
-WRKSRC=		${WRKDIR}/jasmin
-
-post-extract:
-	@${MKDIR} ${WRKSRC}/FreeBSD
-	@${ECHO_CMD} Main-Class: jasmin.Main >${WRKSRC}/FreeBSD/manifest
-
-do-build:
-	cd ${WRKSRC}/lib/cup && ${JAVAC} -d ${WRKSRC}/FreeBSD java_cup/*.java java_cup/runtime/*.java
-	cd ${WRKSRC}/lib/jas/src && ${JAVAC} -d ${WRKSRC}/FreeBSD jas/*.java
-	cd ${WRKSRC}/FreeBSD && ${JAVA} java_cup.Main < ${WRKSRC}/src/jasmin/parser.cup
-	@${RM} ${WRKSRC}/src/jasmin/parser.java
-	@${RM} ${WRKSRC}/src/jasmin/sym.java
-	@${MV} ${WRKSRC}/FreeBSD/sym.java ${WRKSRC}/FreeBSD/parser.java ${WRKSRC}/src/jasmin
-	cd ${WRKSRC}/FreeBSD && ${JAVAC} -d ../FreeBSD ../src/jasmin/*.java
-	cd ${WRKSRC}/FreeBSD && ${JAR} -cmf manifest jasmin.jar jas jasmin java_cup
+USE_ZIP=	yes
+USE_ANT=	yes
+ALL_TARGET=	jasmin
+USE_JAVA=	1.2+
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/FreeBSD/jasmin.jar ${PREFIX}/share/java
+	${INSTALL_DATA} ${WRKSRC}/jasmin.jar ${JAVAJARDIR}
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/examples ; \
 	  ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/\{} \; ;\
@@ -41,7 +29,7 @@ do-install:
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
-	cd ${WRKSRC}/doc ; \
+	cd ${WRKSRC}/docs ; \
 	  ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; ;\
 	  ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
 .endif
diff --git a/java/jasmin/distinfo b/java/jasmin/distinfo
index 32030114c1b5..53024b9332bd 100644
--- a/java/jasmin/distinfo
+++ b/java/jasmin/distinfo
@@ -1,2 +1,2 @@
-MD5 (jasmin-1.06.tar.gz) = 30b077ab597bb3091a2c58223a57743b
-SIZE (jasmin-1.06.tar.gz) = 410897
+MD5 (jasmin-1.1.zip) = bb96616023ab4efdffa173601004fa17
+SIZE (jasmin-1.1.zip) = 1602998
diff --git a/java/jasmin/pkg-plist b/java/jasmin/pkg-plist
index 8f877edbc524..f10e57e7a985 100644
--- a/java/jasmin/pkg-plist
+++ b/java/jasmin/pkg-plist
@@ -1,4 +1,4 @@
-share/java/jasmin.jar
+share/java/classes/jasmin.jar
 bin/jasmin.sh
 %%EXAMPLESDIR%%/ANewArray.j
 %%EXAMPLESDIR%%/AnInterface.j
@@ -20,42 +20,136 @@ bin/jasmin.sh
 %%EXAMPLESDIR%%/VerifyTest1.j
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/about.html
-%%PORTDOCS%%%%DOCSDIR%%/api/AllNames.html
-%%PORTDOCS%%%%DOCSDIR%%/api/Package-jasmin.html
-%%PORTDOCS%%%%DOCSDIR%%/api/images/OpenBookIcon.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/blue-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/blue-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/class-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/constructor-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/constructors.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/cyan-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/cyan-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/error-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/exception-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/green-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/green-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/interface-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/magenta-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/magenta-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/method-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/methods.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/package-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/red-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/red-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/things
-%%PORTDOCS%%%%DOCSDIR%%/api/images/variable-index.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/variables.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/yellow-ball-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/images/yellow-ball.gif
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin.ClassFile.html
-%%PORTDOCS%%%%DOCSDIR%%/api/jasmin.Main.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/tree.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.gif
+%%PORTDOCS%%%%DOCSDIR%%/jasmin_icon.jpg
 %%PORTDOCS%%%%DOCSDIR%%/javavm.gif
+%%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/syntax.bnf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/images
+%%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%%